diff options
author | Torbjörn Andersson | 2017-08-06 13:30:51 +0200 |
---|---|---|
committer | Torbjörn Andersson | 2017-08-06 13:30:51 +0200 |
commit | 70a2ca8b7d64e993fdab89c7b8b0d30ab4334824 (patch) | |
tree | 2e0686f9a69dc65cf8f2aeb801ccae8f2352b635 /engines/tsage | |
parent | 38a8015b830f8cec32f07bb9262d47cf096644e5 (diff) | |
download | scummvm-rg350-70a2ca8b7d64e993fdab89c7b8b0d30ab4334824.tar.gz scummvm-rg350-70a2ca8b7d64e993fdab89c7b8b0d30ab4334824.tar.bz2 scummvm-rg350-70a2ca8b7d64e993fdab89c7b8b0d30ab4334824.zip |
JANITORIAL: Silence more GCC 7 warnings
All these fall through were marked as deliberate, so again I've only
changed the comment to silence GCC.
Diffstat (limited to 'engines/tsage')
19 files changed, 67 insertions, 67 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp index 1e94e44b74..0143613d3f 100644 --- a/engines/tsage/blue_force/blueforce_scenes0.cpp +++ b/engines/tsage/blue_force/blueforce_scenes0.cpp @@ -311,7 +311,7 @@ void Scene50::Tooltip::highlight(bool btnDown) { BF_GLOBALS._driveToScene = 300; _newSceneNumber = 300; } - // Deliberate fall through to default + // fall through default: BF_GLOBALS._mapLocationId = _locationId; BF_GLOBALS._player.disableControl(); diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp index 6c37d18cc7..846e215f51 100644 --- a/engines/tsage/blue_force/blueforce_scenes1.cpp +++ b/engines/tsage/blue_force/blueforce_scenes1.cpp @@ -410,7 +410,7 @@ void Scene110::Action1::signal() { NpcMover *mover = new NpcMover(); scene->_object4.addMover(mover, &pt, this); } - // No break on purpose + // fall through case 7: setDelay(30); break; @@ -1745,11 +1745,11 @@ void Scene115::signal() { ++_lineNumModifier; if (_lineNumModifier >= 4) _lineNumModifier = 0; - // No break on purpose + // fall through case 0: - // No break on purpose + // fall through case 5115: - // No break on purpose + // fall through default: BF_GLOBALS._player.enableControl(); break; @@ -2295,7 +2295,7 @@ void Scene140::Action1::signal() { case 10: owner->setPosition(Common::Point(212, 117)); setDelay(10); - // No break on purpose + // fall through case 11: owner->setPosition(owner->_position, 1000); setDelay(60); @@ -2303,7 +2303,7 @@ void Scene140::Action1::signal() { case 12: BF_GLOBALS._sound1.play(8); setDelay(60); - // No break on purpose + // fall through case 13: BF_GLOBALS._sceneManager.changeScene(150); default: @@ -2384,7 +2384,7 @@ void Scene150::Action1::signal() { break; case 8: BF_GLOBALS._sound1.stop(); - // No break on purpose + // fall through case 9: _sound1.play(8); setDelay(30); diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp index 0f7324f5c8..301d8d42e5 100644 --- a/engines/tsage/blue_force/blueforce_scenes3.cpp +++ b/engines/tsage/blue_force/blueforce_scenes3.cpp @@ -1240,7 +1240,7 @@ void Scene315::signal() { BF_GLOBALS._walkRegions.disableRegion(4); _object7.remove(); _object6.remove(); - // No break on purpose + // fall through case 3155: BF_GLOBALS._player.enableControl(); _field1B68 = false; @@ -2722,7 +2722,7 @@ void Scene350::postInit(SceneObjectList *OwnerList) { BF_GLOBALS._player.enableControl(); T2_GLOBALS._uiElements._active = true; T2_GLOBALS._uiElements.show(); - // Deliberate fall-through + // fall through case 355: if (BF_GLOBALS.getFlag(onDuty) && BF_GLOBALS.getFlag(gunDrawn)) BF_GLOBALS._player.setVisage(351); @@ -3730,7 +3730,7 @@ void Scene355::signal() { break; case 2357: _harrison.animate(ANIM_MODE_1, NULL); - // Deliberate fall-through + // fall through case 1357: BF_GLOBALS._player.enableControl(); if (BF_GLOBALS.getFlag(gunDrawn)) @@ -4787,7 +4787,7 @@ bool Scene370::Laura::startAction(CursorType action, Event &event) { scene->setAction(&scene->_sequenceManager, scene, 3705, &BF_GLOBALS._player, this, NULL); return true; } - // Deliberate fall-through + // fall through default: return NamedObject::startAction(action, event); } @@ -4953,7 +4953,7 @@ void Scene370::signal() { case 3707: _object5.setDetails(370, 6, -1, 7, 1, (SceneItem *)NULL); BF_GLOBALS._sceneItems.push_back(&_object5); - // Deliberate fall-through + // fall through case 3700: case 3706: _green.setAction(&_sequenceManager, this, 3701, NULL); diff --git a/engines/tsage/blue_force/blueforce_scenes5.cpp b/engines/tsage/blue_force/blueforce_scenes5.cpp index b757860dda..629d00dc4d 100644 --- a/engines/tsage/blue_force/blueforce_scenes5.cpp +++ b/engines/tsage/blue_force/blueforce_scenes5.cpp @@ -2122,7 +2122,7 @@ void Scene570::signal() { _object3.setVisage(572); _object3.setStrip(4); _object3.setFrame(1); - // Deliberate fall-through + // fall through case 5702: case 5703: _object3.fixPriority(1); diff --git a/engines/tsage/blue_force/blueforce_scenes7.cpp b/engines/tsage/blue_force/blueforce_scenes7.cpp index 268c755299..ee713464bf 100644 --- a/engines/tsage/blue_force/blueforce_scenes7.cpp +++ b/engines/tsage/blue_force/blueforce_scenes7.cpp @@ -135,7 +135,7 @@ bool Scene710::Object5::startAction(CursorType action, Event &event) { } return true; } - // No break on purpose + // fall through default: return NamedObject::startAction(action, event); } @@ -242,7 +242,7 @@ void Scene710::signal() { break; case 7105: _throwStick = true; - // No break on purpose + // fall through case 7104: _sceneMode = 7102; setAction(&_sequenceManager1, this, 7102, &_dog, NULL); diff --git a/engines/tsage/blue_force/blueforce_scenes8.cpp b/engines/tsage/blue_force/blueforce_scenes8.cpp index 15767215c5..ea0f93f81a 100644 --- a/engines/tsage/blue_force/blueforce_scenes8.cpp +++ b/engines/tsage/blue_force/blueforce_scenes8.cpp @@ -2624,7 +2624,7 @@ void Scene860::Action1::signal() { BF_GLOBALS._player.setStrip(2); } signal(); - // Deliberate fall-through + // fall through case 2: BF_GLOBALS._player.animate(ANIM_MODE_1, NULL); ADD_MOVER_NULL(BF_GLOBALS._player, scene->_destPos.x, scene->_destPos.y); diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp index 5ba82a4714..5bcc44a2b9 100644 --- a/engines/tsage/blue_force/blueforce_scenes9.cpp +++ b/engines/tsage/blue_force/blueforce_scenes9.cpp @@ -266,7 +266,7 @@ void Scene900::Action1::signal() { } case 6: _actionIndex = 0; - // No break on purpose + // fall through case 4: setDelay(30); break; @@ -1629,7 +1629,7 @@ bool Scene910::BlackPlug::startAction(CursorType action, Event &event) { SET_EXT_FGCOLOR, 13, LIST_END); return true; } - // no break on purpose + // fall through case INV_YELLOW_CORD: if (BF_GLOBALS._v4CECC == 0) { BF_GLOBALS._v4CECC = 1; @@ -1664,7 +1664,7 @@ bool Scene910::BlackPlug::startAction(CursorType action, Event &event) { SET_EXT_FGCOLOR, 13, LIST_END); return true; } - //No break on purpose + // fall through case INV_BLACK_CORD: if (BF_GLOBALS._v4CECA == 0) { if (_state == 1) { @@ -2305,7 +2305,7 @@ void Scene910::signal() { BF_GLOBALS._player.disableControl(); BF_GLOBALS._player.setAction(&_sequenceManager2, NULL, 9117, &_nico, NULL); BF_GLOBALS._nico910State = 2; - // No break on purpose + // fall through case 15: _stuart.postInit(); _stuart.setDetails(910, 66, 67, 68, 5, &_nico); diff --git a/engines/tsage/ringworld/ringworld_scenes1.cpp b/engines/tsage/ringworld/ringworld_scenes1.cpp index 9eacc5ff10..f9599b6971 100644 --- a/engines/tsage/ringworld/ringworld_scenes1.cpp +++ b/engines/tsage/ringworld/ringworld_scenes1.cpp @@ -1975,7 +1975,7 @@ void Scene60::Action1::signal() { break; case 4: g_globals->setFlag(90); - // Deliberate fall-through + // fall through case 5: case 6: case 7: diff --git a/engines/tsage/ringworld/ringworld_scenes10.cpp b/engines/tsage/ringworld/ringworld_scenes10.cpp index 99c953217c..b42b62a4b5 100644 --- a/engines/tsage/ringworld/ringworld_scenes10.cpp +++ b/engines/tsage/ringworld/ringworld_scenes10.cpp @@ -103,7 +103,7 @@ void Scene9100::signal() { break; case 9105: _hotspotCleanedClothes.remove(); - // No break on purpose + // fall through case 9103: case 9104: case 9107: @@ -336,7 +336,7 @@ void Scene9200::signal() { break; case 9210: _hotspot1.remove(); - // No break on purpose + // fall through case 9201: case 9202: case 9203: @@ -480,7 +480,7 @@ void Scene9300::signal() { switch (_sceneMode++) { case 9301: g_globals->setFlag(84); - // No break on purpose + // fall through case 9303: g_globals->_soundHandler.play(295); g_globals->_sceneManager.changeScene(9350); @@ -938,7 +938,7 @@ void Scene9450::signal() { break; case 1006: g_globals->setFlag(87); - // No break on purpose + // fall through default: g_globals->_player.enableControl(); break; @@ -1240,7 +1240,7 @@ void Scene9700::signal() { switch (_sceneMode ++) { case 9703: g_globals->setFlag(88); - // No break on purpose + // fall through case 9701: case 9702: _gfxButton1.setText(EXIT_MSG); @@ -1700,7 +1700,7 @@ void Scene9900::strAction2::signal() { _txtArray2[0]._position.y = 400; _txtArray2[1]._position.y = 500; _var3 = 0; - // No break on purpose + // fall through case 1: { Common::String msg = g_resourceManager->getMessage(8030, _lineNum++); if (msg.compareTo("LASTCREDIT")) { diff --git a/engines/tsage/ringworld/ringworld_scenes3.cpp b/engines/tsage/ringworld/ringworld_scenes3.cpp index a9ed7af870..b112bf6b4f 100644 --- a/engines/tsage/ringworld/ringworld_scenes3.cpp +++ b/engines/tsage/ringworld/ringworld_scenes3.cpp @@ -5907,7 +5907,7 @@ void Scene2320::postInit(SceneObjectList *OwnerList) { _hotspot11.setPosition(Common::Point(178, 118)); _hotspot11.animate(ANIM_MODE_1, NULL); } - // Deliberate fall-through + // fall through case 4250: case 5000: case 7000: diff --git a/engines/tsage/ringworld/ringworld_scenes5.cpp b/engines/tsage/ringworld/ringworld_scenes5.cpp index 98859f32ee..93951370a9 100644 --- a/engines/tsage/ringworld/ringworld_scenes5.cpp +++ b/engines/tsage/ringworld/ringworld_scenes5.cpp @@ -1160,7 +1160,7 @@ void Scene4000::signal() { case 4010: g_globals->setFlag(38); _olo.remove(); - // Deliberate fall-through + // fall through case 4001: g_globals->_player.enableControl(); break; @@ -1173,7 +1173,7 @@ void Scene4000::signal() { break; case 4004: RING_INVENTORY._ladder._sceneNumber = 4000; - // Deliberate fall-through + // fall through case 4007: g_globals->_player._uiEnabled = true; g_globals->_events.setCursor(CURSOR_USE); diff --git a/engines/tsage/ringworld/ringworld_scenes6.cpp b/engines/tsage/ringworld/ringworld_scenes6.cpp index 74f834c64f..ba6471dbf0 100644 --- a/engines/tsage/ringworld/ringworld_scenes6.cpp +++ b/engines/tsage/ringworld/ringworld_scenes6.cpp @@ -1363,7 +1363,7 @@ void Scene5100::signal() { g_globals->_player.setStrip(6); g_globals->_player.fixPriority(-1); g_globals->_player.animate(ANIM_MODE_1, NULL); - // No break on purpose + // fall through case 5117: g_globals->_player.enableControl(); break; @@ -2149,7 +2149,7 @@ void Scene5300::signal() { break; case 5307: _soundHandler.fadeOut(NULL); - // No break on purpose + // fall through case 5302: case 5308: case 5316: diff --git a/engines/tsage/ringworld/ringworld_scenes8.cpp b/engines/tsage/ringworld/ringworld_scenes8.cpp index 60bd72e1ef..8bbbba98d9 100644 --- a/engines/tsage/ringworld/ringworld_scenes8.cpp +++ b/engines/tsage/ringworld/ringworld_scenes8.cpp @@ -1669,7 +1669,7 @@ void Scene7700::Action3::signal() { scene->_sceneHotspot9.remove(); scene->_object19.remove(); setDelay(60); - // No break on purpose! + // fall through case 2: scene->_soundHandler.play(260); scene->_object8.setVisage(7703); @@ -1690,7 +1690,7 @@ void Scene7700::Action4::signal() { switch (_actionIndex++) { case 2: scene->_object13.remove(); - // No break on purpose! + // fall through case 0: setDelay(3); break; diff --git a/engines/tsage/ringworld2/ringworld2_outpost.cpp b/engines/tsage/ringworld2/ringworld2_outpost.cpp index d0d67031ec..f50dd03b35 100644 --- a/engines/tsage/ringworld2/ringworld2_outpost.cpp +++ b/engines/tsage/ringworld2/ringworld2_outpost.cpp @@ -937,7 +937,7 @@ void Scene1337::Action1::signal() { scene->_stockPile.remove(); } - // No break on purpose + // fall through case 0: R2_GLOBALS._sceneObjects->draw(); signal(); @@ -2547,11 +2547,11 @@ void Scene1337::handlePlayerTurn() { if (_displayHelpFl) actionDisplay(1330, 114, 159, 10, 1, 200, 0, 7, 0, 154, 154); _displayHelpFl = false; - // No break on purpose + // fall through case 0: - // No break on purpose + // fall through case 1: - // No break on purpose + // fall through case 3: _actionItem.setAction(&_action4); default: diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index 63879b0366..16fb870120 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -1326,7 +1326,7 @@ void Scene160::Action1::signal() { scene->_yChange = 1; scene->_lineNum = 0; ++_actionIndex; - // Deliberate fall-through + // fall through case 1: setDelay(5); @@ -3638,7 +3638,7 @@ void Scene300::signal() { break; case 181: R2_GLOBALS._player.setStrip(6); - // Deliberate fall-through + // fall through default: R2_GLOBALS._player.enableControl(CURSOR_TALK); @@ -3744,7 +3744,7 @@ void Scene300::signal() { case 310: R2_GLOBALS._player.setStrip(5); - // Deliberate fall-through + // fall through case 309: signal309(); R2_GLOBALS._events.setCursor(CURSOR_ARROW); @@ -7870,7 +7870,7 @@ void Scene900::signal() { break; case 5: _sceneMode = 0; - // No break on purpose + // fall through default: R2_GLOBALS._player.enableControl(); R2_GLOBALS._player._canWalk = false; diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index 70937fcbc4..79e8963b58 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -1401,7 +1401,7 @@ void Scene1500::signal() { case 0: R2_GLOBALS.setFlag(25); setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL); - // No break on purpose + // fall through case 1: if (_starship._yDiff < 50) { _starship.setPosition(Common::Point(289, 239), _starship._yDiff + 1); @@ -1424,12 +1424,12 @@ void Scene1500::signal() { break; case 13: R2_GLOBALS._player._characterIndex = R2_MIRANDA; - // No break on purpose + // fall through case 4: R2_GLOBALS._sceneManager.changeScene(300); break; case 10: - // No break on purpose + // fall through case 20: setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL); break; @@ -2225,11 +2225,11 @@ void Scene1550::postInit(SceneObjectList *OwnerList) { switch (R2_GLOBALS._sceneManager._previousScene) { case 1530: R2_GLOBALS._stripModifier = 0; - // No break on purpose + // fall through case 300: - // No break on purpose + // fall through case 1500: - // No break on purpose + // fall through case 3150: R2_GLOBALS._sound1.play(105); break; @@ -7309,7 +7309,7 @@ void Scene1900::signal() { break; case 1904: R2_GLOBALS._scene1925CurrLevel = -3; - // No break on purpose + // fall through case 1905: R2_GLOBALS._player.disableControl(CURSOR_WALK); R2_GLOBALS._sceneManager.changeScene(1925); @@ -7323,7 +7323,7 @@ void Scene1900::signal() { break; case 1906: R2_GLOBALS._scene1925CurrLevel = -3; - // No break on purpose + // fall through default: R2_GLOBALS._player.enableControl(); break; @@ -7517,7 +7517,7 @@ void Scene1925::changeLevel(bool upFlag) { break; case 512: R2_GLOBALS._scene1925CurrLevel = 508; - // No break on purpose + // fall through default: loadScene(_levelResNum[(R2_GLOBALS._scene1925CurrLevel % 4)]); R2_GLOBALS._sceneItems.remove(&_button); @@ -7561,10 +7561,10 @@ void Scene1925::postInit(SceneObjectList *OwnerList) { case 3: _door.setDetails(1925, 0, 1, 2, 1, (SceneItem *) NULL); _button.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 1, NULL); - // No break on purpose + // fall through case -3: _westExit.setDetails(Rect(83, 38, 128, 101), EXITCURSOR_W, 1925); - // No break on purpose + // fall through default: _exitUp.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1925); _exitDown.setDetails(Rect(128, 160, 190, 167), EXITCURSOR_S, 1925); @@ -7647,7 +7647,7 @@ void Scene1925::signal() { _newSceneMode = 0; setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL); } - // No break on purpose + // fall through default: R2_GLOBALS._player.enableControl(CURSOR_USE); break; @@ -7708,7 +7708,7 @@ bool Scene1945::Ice::startAction(CursorType action, Event &event) { else scene->_ice.setDetails(1945, 3, -1, 5, 3, (SceneItem *) NULL); } - // No break on purpose + // fall through default: return SceneHotspot::startAction(action, event); break; @@ -7951,7 +7951,7 @@ void Scene1945::signal() { R2_GLOBALS.clearFlag(42); R2_GLOBALS.setFlag(43); _nextSceneMode1 = 1940; - // No break on purpose + // fall through case 1949: _sceneMode = _nextSceneMode1; if (_nextSceneMode2 == 1943) { diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp index 6b44ecc514..ca630b0307 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp @@ -1883,7 +1883,7 @@ void Scene2440::signal() { case 2440: _oilLamp.remove(); R2_INVENTORY.setObjectScene(R2_ALCOHOL_LAMP_2, 2); - // No break on purpose + // fall through default: R2_GLOBALS._player.enableControl(); break; @@ -4388,7 +4388,7 @@ void Scene2800::Action2::signal() { _object4.setStrip(2); _object4.setFrame(11); R2_GLOBALS._player.hide(); - // No break on purpose + // fall through case 18: R2_GLOBALS._sound1.play(241); _object4.animate(ANIM_MODE_6, this); diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index 8610e0c8bc..d0279b3ae9 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -359,7 +359,7 @@ void Scene3125::signal() { break; case 3126: R2_GLOBALS.setFlag(79); - // No break on purpose + // fall through case 3176: R2_GLOBALS._sceneManager.changeScene(3250); break; @@ -3027,7 +3027,7 @@ void Scene3500::Action1::turnShuttle(bool arg1) { case 4: scene->_shuttle._frameChange = _direction; scene->_shuttle.setFrame(scene->_shuttle.changeFrame()); - // No break on purpose + // fall through case 3: _actionIndex = 10; setDelay(0); @@ -3050,7 +3050,7 @@ void Scene3500::Action1::turnShuttle(bool arg1) { scene->_shuttle._frameChange = _direction; scene->_shuttle.setFrame(scene->_shuttle.changeFrame()); setDelay(1); - // No break on purpose + // fall through case 8: scene->_tunnelHorzCircle.setStrip(2); _actionIndex = 1; @@ -3079,7 +3079,7 @@ void Scene3500::Action1::signal() { setDelay(1); return; } - // No break on purpose + // fall through case 3: scene->_shuttle._frameChange = _direction; scene->_shuttle.setFrame(scene->_shuttle.changeFrame()); @@ -3158,7 +3158,7 @@ void Scene3500::Action1::signal() { break; } } - // No break on purpose + // fall through case 2: { scene->_tunnelVertCircle.setPosition(Common::Point(160, 73)); scene->_tunnelVertCircle._moveDiff.x = 160 - scene->_mazeChangeAmount; @@ -4345,7 +4345,7 @@ void Scene3600::Action2::signal() { R2_GLOBALS._player.enableControl(); _actionIndex = 3619; scene->_protector._state = 0; - // No break on purpose + // fall through case 3619: { ++_actionIndex; scene->_protector.setup(3127, 2, 1); diff --git a/engines/tsage/ringworld2/ringworld2_vampire.cpp b/engines/tsage/ringworld2/ringworld2_vampire.cpp index 9d3b7f91a5..e49a804cd0 100644 --- a/engines/tsage/ringworld2/ringworld2_vampire.cpp +++ b/engines/tsage/ringworld2/ringworld2_vampire.cpp @@ -1166,7 +1166,7 @@ void Scene1950::initArea() { // No break on purpose case 65: _upExit._enabled = true; - // No break on purpose + // fall through case 35: // No break on purpose case 38: @@ -1665,7 +1665,7 @@ void Scene1950::signal() { case 1975: SceneItem::display(1950, 21, SET_WIDTH, 280, SET_X, 160, SET_POS_MODE, 1, SET_Y, 20, SET_EXT_BGCOLOR, 7, LIST_END); - // No break on purpose + // fall through case 13: // Moving east within the Flub maze ++R2_GLOBALS._flubMazeArea; |