diff options
Diffstat (limited to 'engines/tsage/ringworld')
-rw-r--r-- | engines/tsage/ringworld/ringworld_scenes1.cpp | 2 | ||||
-rw-r--r-- | engines/tsage/ringworld/ringworld_scenes10.cpp | 12 | ||||
-rw-r--r-- | engines/tsage/ringworld/ringworld_scenes3.cpp | 2 | ||||
-rw-r--r-- | engines/tsage/ringworld/ringworld_scenes5.cpp | 4 | ||||
-rw-r--r-- | engines/tsage/ringworld/ringworld_scenes6.cpp | 4 | ||||
-rw-r--r-- | engines/tsage/ringworld/ringworld_scenes8.cpp | 4 |
6 files changed, 14 insertions, 14 deletions
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; |