aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/ringworld2
diff options
context:
space:
mode:
authorTorbjörn Andersson2017-08-06 13:30:51 +0200
committerTorbjörn Andersson2017-08-06 13:30:51 +0200
commit70a2ca8b7d64e993fdab89c7b8b0d30ab4334824 (patch)
tree2e0686f9a69dc65cf8f2aeb801ccae8f2352b635 /engines/tsage/ringworld2
parent38a8015b830f8cec32f07bb9262d47cf096644e5 (diff)
downloadscummvm-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/ringworld2')
-rw-r--r--engines/tsage/ringworld2/ringworld2_outpost.cpp8
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes0.cpp8
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.cpp28
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes2.cpp4
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes3.cpp12
-rw-r--r--engines/tsage/ringworld2/ringworld2_vampire.cpp4
6 files changed, 32 insertions, 32 deletions
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;