aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/insane/insane_enemy.cpp
diff options
context:
space:
mode:
authorD G Turner2019-12-23 11:56:16 +0000
committerD G Turner2019-12-23 11:56:16 +0000
commit59b639ed4d9b8c45644053641522dedabd12fa56 (patch)
treecc98618132f1de362fca07369718af68df44e70a /engines/scumm/insane/insane_enemy.cpp
parentd5808d2903e2cc2a04e8545b84f1528230a9b010 (diff)
downloadscummvm-rg350-59b639ed4d9b8c45644053641522dedabd12fa56.tar.gz
scummvm-rg350-59b639ed4d9b8c45644053641522dedabd12fa56.tar.bz2
scummvm-rg350-59b639ed4d9b8c45644053641522dedabd12fa56.zip
SCUMM: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/scumm/insane/insane_enemy.cpp')
-rw-r--r--engines/scumm/insane/insane_enemy.cpp37
1 files changed, 37 insertions, 0 deletions
diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp
index 40dd453722..9b8ccd08a8 100644
--- a/engines/scumm/insane/insane_enemy.cpp
+++ b/engines/scumm/insane/insane_enemy.cpp
@@ -50,6 +50,7 @@ int32 Insane::enemyInitializer(int num, int32 actor1, int32 actor2, int32 probab
case EN_TORQUE:
return enemy8initializer(actor1, actor2, probability);
case -1:
+ default:
// nothing
break;
}
@@ -81,6 +82,7 @@ int32 Insane::enemyHandler(int num, int32 actor1, int32 actor2, int32 probabilit
case EN_BEN:
return enemyBenHandler(actor1, actor2, probability);
case -1:
+ default:
// nothing
break;
}
@@ -175,6 +177,8 @@ int32 Insane::enemy0handler(int32 actor1, int32 actor2, int32 probability) {
prepareScenePropScene(52, 0, 0);
}
break;
+ default:
+ break;
}
} else {
switch (_vm->_rnd.getRandomNumber(14)) {
@@ -340,6 +344,8 @@ int32 Insane::enemy1handler(int32 actor1, int32 actor2, int32 probability) {
prepareScenePropScene(37, 0, 0);
}
break;
+ default:
+ break;
}
} else {
switch (_vm->_rnd.getRandomNumber(14)) {
@@ -493,6 +499,8 @@ int32 Insane::enemy2handler(int32 actor1, int32 actor2, int32 probability) {
prepareScenePropScene(27, 0, 0);
}
break;
+ default:
+ break;
}
} else {
if (_actor[actor1].kicking) {
@@ -664,6 +672,8 @@ int32 Insane::enemy3handler(int32 actor1, int32 actor2, int32 probability) {
prepareScenePropScene(8, 0, 0);
}
break;
+ default:
+ break;
}
_enHdlVar[EN_VULTF1][7] = _enHdlVar[EN_VULTF1][8];
}
@@ -796,6 +806,8 @@ int32 Insane::enemy4handler(int32 actor1, int32 actor2, int32 probability) {
prepareScenePropScene(47, 0, 0);
}
break;
+ default:
+ break;
}
} else {
if (_actor[actor1].kicking) {
@@ -806,6 +818,8 @@ int32 Insane::enemy4handler(int32 actor1, int32 actor2, int32 probability) {
case 9: // Original is 10 here which never happens
prepareScenePropScene(45, 0, 0);
break;
+ default:
+ break;
}
} else {
if (weaponMaxRange(actor2) >= dist) {
@@ -822,6 +836,8 @@ int32 Insane::enemy4handler(int32 actor1, int32 actor2, int32 probability) {
prepareScenePropScene(43, 0, 0);
}
break;
+ default:
+ break;
}
} else {
switch (_vm->_rnd.getRandomNumber(14)) {
@@ -837,6 +853,8 @@ int32 Insane::enemy4handler(int32 actor1, int32 actor2, int32 probability) {
prepareScenePropScene(40, 0, 0);
}
break;
+ default:
+ break;
}
}
}
@@ -937,6 +955,8 @@ int32 Insane::enemy5handler(int32 actor1, int32 actor2, int32 probability) {
prepareScenePropScene(12, 0, 0);
}
break;
+ default:
+ break;
}
else {
if (_actor[actor1].kicking) {
@@ -955,6 +975,8 @@ int32 Insane::enemy5handler(int32 actor1, int32 actor2, int32 probability) {
_enemyState[EN_VULTF2][1] = 1;
prepareScenePropScene(10, 0, 0);
break;
+ default:
+ break;
}
} else {
switch (_vm->_rnd.getRandomNumber(14)) {
@@ -970,6 +992,8 @@ int32 Insane::enemy5handler(int32 actor1, int32 actor2, int32 probability) {
prepareScenePropScene(14, 0, 0);
}
break;
+ default:
+ break;
}
}
}
@@ -1062,6 +1086,8 @@ int32 Insane::enemy6handler(int32 actor1, int32 actor2, int32 probability) {
prepareScenePropScene(22, 0, 0);
}
break;
+ default:
+ break;
}
_enHdlVar[EN_VULTM2][1] = 1;
goto _label1;
@@ -1101,6 +1127,8 @@ int32 Insane::enemy6handler(int32 actor1, int32 actor2, int32 probability) {
prepareScenePropScene(24, 0, 0);
}
break;
+ default:
+ break;
}
}
}
@@ -1450,6 +1478,8 @@ void Insane::actor11Reaction(int32 buttons) {
_actor[1].x += _actor[1].cursorX / 32;
break;
+ default:
+ break;
}
tmpx = _actor[1].x;
@@ -1607,6 +1637,9 @@ void Insane::setEnemyState() {
case INV_DUST:
_actor[1].weaponClass = 2;
_actor[1].act[2].state = 1;
+ break;
+ default:
+ break;
}
}
@@ -1754,6 +1787,8 @@ void Insane::actor12Reaction(int32 buttons) {
if (calcBenDamage(1, 0))
smlayer_startSfx(73);
break;
+ default:
+ break;
}
smlayer_setActorFacing(1, 2, 21, 180);
_actor[1].act[2].state = 13;
@@ -2105,6 +2140,8 @@ void Insane::actor12Reaction(int32 buttons) {
case EN_VULTF2:
smlayer_startVoice(276);
break;
+ default:
+ break;
}
}
break;