HOPKINS: Fixed warnings about switch statements using DIR_ constants

scummvm · Feb 19, 2013 · 7a73412 · 7a73412
1 parent f92154d
commit 7a73412
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
@@ -2549,6 +2549,8 @@ void HopkinsEngine::BTOCEAN() {
 		case DIR_DOWN:
 			_objectsManager.SPACTION(_globals.PERSO, "9,10,11,12,13,14,15,16,17,18,-1,", 0, 0, 6, false);
 			break;
+		default:
+			break;
 		}
 
 		_globals._oceanDirection = DIR_LEFT;
@@ -2584,6 +2586,8 @@ void HopkinsEngine::BTOCEAN() {
 		case DIR_LEFT:
 			_objectsManager.SPACTION(_globals.PERSO, "18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,-1,", 0, 0, 6, false);
 			break;
+		default:
+			break;
 		}
 		_globals._oceanDirection = DIR_RIGHT;
 		_globals._exitId = 2;
@@ -2651,6 +2655,8 @@ void HopkinsEngine::BTOCEAN() {
 			if (!displAnim)
 				_objectsManager.SPACTION(_globals.PERSO, "18,19,20,21,22,23,24,25,26,27,-1,", 0, 0, 6, false);
 			break;
+		default:
+			break;
 		}
 		_globals._oceanDirection = DIR_UP;
 		_globals._exitId = 3;
@@ -2702,6 +2708,8 @@ void HopkinsEngine::BTOCEAN() {
 				}
 			}
 			break;
+		default:
+			break;
 		}
 		_globals._oceanDirection = DIR_DOWN;
 		_globals._exitId = 4;
@@ -2723,6 +2731,8 @@ void HopkinsEngine::OCEAN_HOME() {
 	case DIR_LEFT:
 		_objectsManager.setSpriteIndex(0, 18);
 		break;
+	default:
+		break;
 	}
 }
 
@@ -2775,6 +2785,8 @@ void HopkinsEngine::OCEAN(int16 curExitId, Common::String backgroundFilename, Di
 		_objectsManager._characterPos.x = 415;
 		_objectsManager._startSpriteIndex = 18;
 		break;
+	default:
+		break;
 	}
 
 	_objectsManager.addStaticSprite(_globals.PERSO, Common::Point(_objectsManager._characterPos.x, 110), 0, _objectsManager._startSpriteIndex, 0, false, 0, 0);

diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp
@@ -573,6 +573,8 @@ bool LinesManager::MIRACLE(int fromX, int fromY, int a3, int a4, int a5) {
 			curY -= 2;
 			curX -= 2;
 			break;
+		default:
+			break;
 		}
 	}
 	int v41 = curX;
@@ -766,6 +768,8 @@ bool LinesManager::MIRACLE(int fromX, int fromY, int a3, int a4, int a5) {
 			NV_POSI = v7;
 			return true;
 			break;
+		default:
+			break;
 		}
 	}
 	return false;
@@ -1072,6 +1076,8 @@ int LinesManager::GENIAL(int lineIdx, int dataIdx, int a3, int a4, int a5, int a
 				--NVPY;
 				--NVPX;
 				break;
+			default:
+				break;
 			}
 		}
 	} else {
@@ -1591,6 +1597,8 @@ int LinesManager::PARC_PERS(int fromX, int fromY, int destX, int destY, int a5,
 			curY -= 2;
 			curX -= 2;
 			break;
+		default:
+			break;
 		}
 	}
 	v98 = curX;

diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
@@ -1629,6 +1629,8 @@ void ObjectsManager::GOHOME2() {
 			case DIR_LEFT:
 				setSpriteIndex(0, 7);
 				break;
+			default:
+				break;
 			}
 
 			return;
@@ -1648,6 +1650,8 @@ void ObjectsManager::GOHOME2() {
 	case DIR_LEFT:
 		setSpriteIndex(0, 3);
 		break;
+	default:
+		break;
 	}
 
 	_vm->_linesManager._route = (RouteItem *)g_PTRNUL;