From ecfedb1e81dc738620bdc42be15855559674a9ef Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Tue, 20 Jun 2006 18:55:25 +0000 Subject: Cleanup. It seems unnecessary to have a "break" right after an unconditional return in a switch case. svn-id: r23198 --- engines/scumm/help.cpp | 3 --- engines/scumm/insane/insane_enemy.cpp | 19 ------------------- engines/scumm/insane/insane_scenes.cpp | 6 ------ engines/scumm/script_v5.cpp | 5 ----- engines/scumm/script_v6.cpp | 9 --------- 5 files changed, 42 deletions(-) (limited to 'engines/scumm') diff --git a/engines/scumm/help.cpp b/engines/scumm/help.cpp index 537e027997..35ba4ba96d 100644 --- a/engines/scumm/help.cpp +++ b/engines/scumm/help.cpp @@ -35,10 +35,8 @@ int ScummHelp::numPages(byte gameId) { case GID_MANIAC: case GID_ZAK: return 4; - break; case GID_INDY3: return 6; - break; case GID_LOOM: case GID_MONKEY_EGA: case GID_MONKEY_VGA: @@ -51,7 +49,6 @@ int ScummHelp::numPages(byte gameId) { case GID_FT: case GID_CMI: return 3; - break; /* TODO - I don't know the controls for these games case GID_PUTTDEMO: case GID_PUTTPUTT: diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp index 90fc4a4689..1c3830154b 100644 --- a/engines/scumm/insane/insane_enemy.cpp +++ b/engines/scumm/insane/insane_enemy.cpp @@ -33,31 +33,22 @@ int32 Insane::enemyInitializer(int num, int32 actor1, int32 actor2, int32 probab switch (num) { case EN_ROTT1: return enemy0initializer(actor1, actor2, probability); - break; case EN_ROTT2: return enemy1initializer(actor1, actor2, probability); - break; case EN_ROTT3: return enemy2initializer(actor1, actor2, probability); - break; case EN_VULTF1: return enemy3initializer(actor1, actor2, probability); - break; case EN_VULTM1: return enemy4initializer(actor1, actor2, probability); - break; case EN_VULTF2: return enemy5initializer(actor1, actor2, probability); - break; case EN_VULTM2: return enemy6initializer(actor1, actor2, probability); - break; case EN_CAVEFISH: return enemy7initializer(actor1, actor2, probability); - break; case EN_TORQUE: return enemy8initializer(actor1, actor2, probability); - break; case -1: // nothing break; @@ -71,34 +62,24 @@ int32 Insane::enemyHandler(int num, int32 actor1, int32 actor2, int32 probabilit switch (num) { case EN_ROTT1: return enemy0handler(actor1, actor2, probability); - break; case EN_ROTT2: return enemy1handler(actor1, actor2, probability); - break; case EN_ROTT3: return enemy2handler(actor1, actor2, probability); - break; case EN_VULTF1: return enemy3handler(actor1, actor2, probability); - break; case EN_VULTM1: return enemy4handler(actor1, actor2, probability); - break; case EN_VULTF2: return enemy5handler(actor1, actor2, probability); - break; case EN_VULTM2: return enemy6handler(actor1, actor2, probability); - break; case EN_CAVEFISH: return enemy7handler(actor1, actor2, probability); - break; case EN_TORQUE: return enemy8handler(actor1, actor2, probability); - break; case EN_BEN: return enemyBenHandler(actor1, actor2, probability); - break; case -1: // nothing break; diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp index d6dd75f813..343299425f 100644 --- a/engines/scumm/insane/insane_scenes.cpp +++ b/engines/scumm/insane/insane_scenes.cpp @@ -632,12 +632,10 @@ void Insane::setSceneCostumes(int sceneId) { smlayer_setFluPalette(_smush_roadrashRip, 0); setupValues(); return; - break; case 17: smlayer_setFluPalette(_smush_goglpaltRip, 0); setupValues(); return; - break; case 2: if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC)) smlayer_setActorCostume(0, 2, readArray(9)); @@ -645,19 +643,16 @@ void Insane::setSceneCostumes(int sceneId) { smlayer_setActorCostume(0, 2, readArray(10)); setupValues(); return; - break; case 13: setEnemyCostumes(); smlayer_setFluPalette(_smush_roadrashRip, 0); return; - break; case 21: _currEnemy = EN_ROTT3; //PATCH setEnemyCostumes(); _actor[1].y = 200; smlayer_setFluPalette(_smush_roadrashRip, 0); return; - break; case 4: case 5: case 6: @@ -668,7 +663,6 @@ void Insane::setSceneCostumes(int sceneId) { smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1+190, _smlayer_room2); setupValues(); return; - break; case 7: case 8: writeArray(4, 0); diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp index bdc34ea0f0..a7c5c3f9c6 100644 --- a/engines/scumm/script_v5.cpp +++ b/engines/scumm/script_v5.cpp @@ -882,11 +882,9 @@ void ScummEngine_v5::saveVars() { break; case 0x04: return; - break; case 0x1F: // close file debug(0, "stub saveVars close file"); return; - break; } } } @@ -916,11 +914,9 @@ void ScummEngine_v5::loadVars() { break; case 0x04: return; - break; case 0x1F: // close file debug(0, "stub loadVars close file"); return; - break; } } } @@ -1921,7 +1917,6 @@ void ScummEngine_v5::o5_roomOps() { case 30: debug(0, "o5_roomOps: unhandled FM-TOWNS fadeEffect %d", a); return; - break; } } _switchRoomEffect = (byte)(a & 0xFF); diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index 5379bdb1fa..a809439c00 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -2791,35 +2791,26 @@ int ScummEngine::getKeyState(int key) { switch (key) { case 0x147: // Home return (_keyDownMap[0x107] || _keyDownMap[0x115]) ? 1 : 0; - break; case 0x148: // Up return (_keyDownMap[0x108] || _keyDownMap[0x111] || _keyDownMap[0x38]) ? 1 : 0; - break; case 0x149: // PgUp return (_keyDownMap[0x109] || _keyDownMap[0x118]) ? 1 : 0; - break; case 0x14B: // Left return (_keyDownMap[0x104] || _keyDownMap[0x114] || _keyDownMap[0x34]) ? 1 : 0; - break; case 0x14D: // Right return (_keyDownMap[0x106] || _keyDownMap[0x113] || _keyDownMap[0x36]) ? 1 : 0; - break; case 0x14F: // End return (_keyDownMap[0x101] || _keyDownMap[0x117]) ? 1 : 0; - break; case 0x150: // Down return (_keyDownMap[0x102] || _keyDownMap[0x112] || _keyDownMap[0x32]) ? 1 : 0; - break; case 0x151: // PgDn return (_keyDownMap[0x103] || _keyDownMap[0x119]) ? 1 : 0; - break; default: return (_keyDownMap[key]) ? 1 : 0; - break; } } -- cgit v1.2.3