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/blue_force | |
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/blue_force')
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes0.cpp | 2 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes1.cpp | 14 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes3.cpp | 10 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes5.cpp | 2 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes7.cpp | 4 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes8.cpp | 2 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes9.cpp | 8 |
7 files changed, 21 insertions, 21 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); |