aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage
diff options
context:
space:
mode:
authorD G Turner2019-11-28 02:10:52 +0000
committerD G Turner2019-11-28 02:10:52 +0000
commit27d26a49ea20e67a179197e5607c4d40200b50d6 (patch)
treedb6cb94be61db41689750d03ea71618153c3c599 /engines/tsage
parent2f8bf11a434f7126e01a1695a76bcec65116c1d5 (diff)
downloadscummvm-rg350-27d26a49ea20e67a179197e5607c4d40200b50d6.tar.gz
scummvm-rg350-27d26a49ea20e67a179197e5607c4d40200b50d6.tar.bz2
scummvm-rg350-27d26a49ea20e67a179197e5607c4d40200b50d6.zip
TSAGE: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/tsage')
-rw-r--r--engines/tsage/blue_force/blueforce_dialogs.cpp2
-rw-r--r--engines/tsage/blue_force/blueforce_scenes0.cpp13
-rw-r--r--engines/tsage/blue_force/blueforce_scenes1.cpp8
-rw-r--r--engines/tsage/blue_force/blueforce_scenes2.cpp2
-rw-r--r--engines/tsage/blue_force/blueforce_scenes3.cpp18
-rw-r--r--engines/tsage/blue_force/blueforce_scenes4.cpp2
-rw-r--r--engines/tsage/blue_force/blueforce_scenes5.cpp10
-rw-r--r--engines/tsage/blue_force/blueforce_scenes6.cpp2
-rw-r--r--engines/tsage/blue_force/blueforce_scenes8.cpp10
-rw-r--r--engines/tsage/core.cpp4
-rw-r--r--engines/tsage/graphics.cpp1
-rw-r--r--engines/tsage/ringworld/ringworld_dialogs.cpp2
-rw-r--r--engines/tsage/ringworld/ringworld_scenes1.cpp52
-rw-r--r--engines/tsage/ringworld/ringworld_scenes10.cpp2
-rw-r--r--engines/tsage/ringworld/ringworld_scenes2.cpp20
-rw-r--r--engines/tsage/ringworld/ringworld_scenes3.cpp161
-rw-r--r--engines/tsage/ringworld/ringworld_scenes4.cpp6
-rw-r--r--engines/tsage/ringworld/ringworld_scenes5.cpp103
-rw-r--r--engines/tsage/ringworld/ringworld_scenes6.cpp49
-rw-r--r--engines/tsage/ringworld/ringworld_scenes8.cpp87
-rw-r--r--engines/tsage/ringworld2/ringworld2_dialogs.cpp2
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes0.cpp8
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.cpp3
-rw-r--r--engines/tsage/sound.cpp4
-rw-r--r--engines/tsage/user_interface.cpp4
25 files changed, 561 insertions, 14 deletions
diff --git a/engines/tsage/blue_force/blueforce_dialogs.cpp b/engines/tsage/blue_force/blueforce_dialogs.cpp
index 99db61b64d..59489f22b8 100644
--- a/engines/tsage/blue_force/blueforce_dialogs.cpp
+++ b/engines/tsage/blue_force/blueforce_dialogs.cpp
@@ -187,6 +187,8 @@ void RightClickDialog::execute() {
// Options dialog
BlueForce::OptionsDialog::show();
break;
+ default:
+ break;
}
if (cursorNum != CURSOR_NONE)
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index 0143613d3f..2b96ce6a80 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -114,6 +114,8 @@ void Scene20::Action1::signal() {
BF_GLOBALS._sceneManager.changeScene(100);
remove();
break;
+ default:
+ break;
}
}
@@ -535,6 +537,8 @@ bool Scene60::Ignition::startAction(CursorType action, Event &event) {
case 2:
if (BF_GLOBALS.getFlag(onDuty) && check2())
return true;
+ default:
+ break;
}
BF_GLOBALS._sound1.play(BF_GLOBALS.getFlag(fWithLyle) ? 80 : 31);
@@ -898,6 +902,8 @@ void Scene60::Action1::signal() {
_actionIndex = 4;
scene->_stripManager.start(633, this);
break;
+ default:
+ break;
}
}
@@ -923,6 +929,8 @@ void Scene60::Action2::signal() {
BF_GLOBALS._player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -945,6 +953,8 @@ void Scene60::Action3::signal() {
BF_GLOBALS._player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -1110,6 +1120,9 @@ void Scene60::postInit(SceneObjectList *OwnerList) {
(BF_GLOBALS._bookmark < bInspectionDone)) {
setAction(&_action3);
}
+ break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp
index ff67f52718..0b71ab788e 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes1.cpp
@@ -81,6 +81,8 @@ void Scene100::Action1::signal() {
case 4:
error("??exit");
break;
+ default:
+ break;
}
}
@@ -158,6 +160,8 @@ void Scene100::Action2::signal() {
case 3:
remove();
break;
+ default:
+ break;
}
}
@@ -282,6 +286,8 @@ void Scene109::Action1::signal() {
scene->_sceneMode = 1;
remove();
break;
+ default:
+ break;
}
}
@@ -3188,6 +3194,8 @@ void Scene190::Action1::signal() {
BF_GLOBALS._sound1.fadeOut2(NULL);
BF_GLOBALS._sceneManager.changeScene(315);
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/blue_force/blueforce_scenes2.cpp b/engines/tsage/blue_force/blueforce_scenes2.cpp
index 65ff85155f..06c7fb054d 100644
--- a/engines/tsage/blue_force/blueforce_scenes2.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes2.cpp
@@ -1812,6 +1812,8 @@ void Scene280::Action1::signal() {
scene->_jake.remove();
scene->_mum.animate(ANIM_MODE_5, NULL);
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index 301d8d42e5..0c1b370423 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -960,6 +960,8 @@ void Scene315::Action1::signal() {
remove();
BF_GLOBALS._player.enableControl();
break;
+ default:
+ break;
}
}
@@ -1908,6 +1910,8 @@ void Scene340::Action6::signal() {
scene->signal();
remove();
break;
+ default:
+ break;
}
}
@@ -3448,6 +3452,8 @@ void Scene355::Action2::signal() {
scene->signal();
remove();
break;
+ default:
+ break;
}
}
@@ -5063,6 +5069,8 @@ void Scene370::signal() {
_green.remove();
BF_GLOBALS._player.enableControl();
break;
+ default:
+ break;
}
}
@@ -5277,6 +5285,8 @@ void Scene385::Action1::signal() {
BF_GLOBALS._player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -5309,6 +5319,8 @@ void Scene385::Action2::signal() {
BF_GLOBALS._player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -5525,6 +5537,8 @@ void Scene385::signal() {
case 3852:
BF_GLOBALS._player.enableControl();
break;
+ default:
+ break;
}
}
@@ -5611,6 +5625,8 @@ void Scene390::Action1::signal() {
BF_GLOBALS._player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -5969,6 +5985,8 @@ void Scene390::signal() {
BF_GLOBALS._deathReason = 18;
BF_GLOBALS._sceneManager.changeScene(666);
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/blue_force/blueforce_scenes4.cpp b/engines/tsage/blue_force/blueforce_scenes4.cpp
index 7c5b41092c..5009b6e854 100644
--- a/engines/tsage/blue_force/blueforce_scenes4.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes4.cpp
@@ -1343,6 +1343,8 @@ void Scene440::signal() {
case 4403:
BF_GLOBALS._sceneManager.changeScene(60);
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/blue_force/blueforce_scenes5.cpp b/engines/tsage/blue_force/blueforce_scenes5.cpp
index 629d00dc4d..9ef5e0dadf 100644
--- a/engines/tsage/blue_force/blueforce_scenes5.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes5.cpp
@@ -49,6 +49,8 @@ void Scene550::Action1::signal() {
BF_GLOBALS._player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -418,6 +420,8 @@ bool Scene551::Drunk::startAction(CursorType action, Event &event) {
case 3:
SceneItem::display2(550, 27);
break;
+ default:
+ break;
}
return true;
case CURSOR_USE:
@@ -1534,6 +1538,8 @@ void Scene560::signal() {
case 11:
BF_GLOBALS._sceneManager.changeScene(270);
break;
+ default:
+ break;
}
}
@@ -1876,6 +1882,8 @@ bool Scene570::Icon::startAction(CursorType action, Event &event) {
scene->_sceneMode = 5704;
scene->setAction(&scene->_sequenceManager, scene, 5704, &scene->_object3, NULL);
break;
+ default:
+ break;
}
return true;
case CURSOR_TALK:
@@ -2417,6 +2425,8 @@ void Scene590::Action2::signal() {
scene->_sceneMode = 3;
scene->signal();
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/blue_force/blueforce_scenes6.cpp b/engines/tsage/blue_force/blueforce_scenes6.cpp
index 921b2c89d0..b18459a0c0 100644
--- a/engines/tsage/blue_force/blueforce_scenes6.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes6.cpp
@@ -258,6 +258,8 @@ void Scene666::Action1::signal() {
case 1:
BF_GLOBALS._game->restartGame();
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/blue_force/blueforce_scenes8.cpp b/engines/tsage/blue_force/blueforce_scenes8.cpp
index ea0f93f81a..51f9a9a25b 100644
--- a/engines/tsage/blue_force/blueforce_scenes8.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes8.cpp
@@ -214,6 +214,8 @@ void Scene800::Action1::signal() {
BF_GLOBALS._player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -345,6 +347,8 @@ void Scene800::signal() {
_lyle.remove();
BF_GLOBALS._player.enableControl();
break;
+ default:
+ break;
}
}
@@ -1720,6 +1724,8 @@ void Scene830::postInit(SceneObjectList *OwnerList) {
_field18AC = 1;
}
break;
+ default:
+ break;
}
_item2.setDetails(7, 830, 9, 10, 11, 1);
@@ -1877,6 +1883,8 @@ void Scene830::signal() {
_object1.remove();
BF_GLOBALS._player.enableControl();
break;
+ default:
+ break;
}
}
@@ -2505,6 +2513,8 @@ void Scene840::signal() {
BF_INVENTORY.setObjectScene(INV_RENTAL_KEYS, 0);
BF_GLOBALS._player.enableControl();
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 247070d59c..f5cd722195 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1184,6 +1184,8 @@ void PaletteRotation::signal() {
}
}
break;
+ default:
+ break;
}
if (flag) {
@@ -2435,6 +2437,8 @@ void SceneObject::animate(int animMode, ...) {
setFrame(getNewFrame());
}
break;
+ default:
+ break;
}
va_end(va);
}
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index 2dd03ab9c3..6210a264f1 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -1445,6 +1445,7 @@ int GfxFont::writeChar(const char ch) {
case 1: *destP = _colors.foreground; break;
case 2: *destP = _colors2.background; break;
case 3: *destP = _colors2.foreground; break;
+ default: break;
}
}
}
diff --git a/engines/tsage/ringworld/ringworld_dialogs.cpp b/engines/tsage/ringworld/ringworld_dialogs.cpp
index bc357cac25..b531dcdb37 100644
--- a/engines/tsage/ringworld/ringworld_dialogs.cpp
+++ b/engines/tsage/ringworld/ringworld_dialogs.cpp
@@ -209,6 +209,8 @@ void RightClickDialog::execute() {
// Dialog options
Ringworld::OptionsDialog::show();
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/ringworld/ringworld_scenes1.cpp b/engines/tsage/ringworld/ringworld_scenes1.cpp
index 7f276b830c..ae55494f3f 100644
--- a/engines/tsage/ringworld/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes1.cpp
@@ -106,6 +106,8 @@ void Scene10::Action1::signal() {
g_globals->_scenePalette.clearListeners();
g_globals->_sceneManager.changeScene(15);
break;
+ default:
+ break;
}
}
@@ -122,6 +124,8 @@ void Scene10::Action2::signal() {
scene->_veeshkaRightArm.animate(ANIM_MODE_5, this);
_actionIndex = 0;
break;
+ default:
+ break;
}
}
@@ -242,6 +246,8 @@ void Scene15::Action1::signal() {
SceneItem::display(0, 0);
g_globals->_sceneManager.changeScene(20);
break;
+ default:
+ break;
}
}
@@ -1077,6 +1083,8 @@ void Scene40::Action1::signal() {
g_globals->_game->endGame(40, 20);
remove();
break;
+ default:
+ break;
}
}
@@ -1160,6 +1168,8 @@ void Scene40::Action2::signal() {
g_globals->_player.enableControl();
scene->_assassin.setAction(&scene->_action8);
break;
+ default:
+ break;
}
}
@@ -1196,6 +1206,8 @@ void Scene40::Action3::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -1211,6 +1223,8 @@ void Scene40::Action4::signal() {
g_globals->_stripNum = 88;
g_globals->_player.enableControl();
break;
+ default:
+ break;
}
}
@@ -1225,6 +1239,9 @@ void Scene40::Action5::signal() {
case 1:
scene->_seekerTail.animate(ANIM_MODE_8, 1, this);
_actionIndex = 0;
+ break;
+ default:
+ break;
}
}
@@ -1262,6 +1279,8 @@ void Scene40::Action6::signal() {
case 2:
remove();
break;
+ default:
+ break;
}
}
@@ -1291,6 +1310,8 @@ void Scene40::Action7::signal() {
_actionIndex = 0;
setDelay(60);
break;
+ default:
+ break;
}
}
@@ -1342,6 +1363,8 @@ void Scene40::Action8::signal() {
g_globals->_game->endGame(40, 45);
remove();
break;
+ default:
+ break;
}
}
@@ -1636,6 +1659,8 @@ void Scene50::Action1::signal() {
g_globals->_stripNum = -1;
g_globals->_sceneManager.changeScene(60);
break;
+ default:
+ break;
}
}
@@ -1657,6 +1682,8 @@ void Scene50::Action2::signal() {
g_globals->_sceneManager.changeScene(40);
remove();
break;
+ default:
+ break;
}
}
@@ -1673,6 +1700,8 @@ void Scene50::Action3::signal() {
g_globals->_sceneManager.changeScene(60);
remove();
break;
+ default:
+ break;
}
}
@@ -1871,6 +1900,8 @@ void Scene50::signal() {
case 54:
g_globals->_player.enableControl();
break;
+ default:
+ break;
}
}
@@ -2039,6 +2070,8 @@ void Scene60::Action2::signal() {
case 3:
g_globals->_sceneManager.changeScene(50);
break;
+ default:
+ break;
}
}
@@ -2553,6 +2586,8 @@ void Scene90::Action1::signal() {
g_globals->_scenePalette.clearListeners();
g_globals->_sceneManager.changeScene(95);
break;
+ default:
+ break;
}
}
@@ -2826,6 +2861,8 @@ void Scene95::Action1::signal() {
case 9:
g_globals->_sceneManager.changeScene(2300);
break;
+ default:
+ break;
}
}
@@ -2883,6 +2920,8 @@ void Scene6100::Action1::signal() {
scene->showMessage(NULL, 0, NULL);
remove();
break;
+ default:
+ break;
}
}
@@ -2900,6 +2939,8 @@ void Scene6100::Action2::signal() {
scene->showMessage(NULL, 0, NULL);
remove();
break;
+ default:
+ break;
}
}
@@ -2942,6 +2983,8 @@ void Scene6100::Action3::signal() {
(scene->_stripManager._currObj44Id == 135) ? 6100 : 2320);
remove();
break;
+ default:
+ break;
}
}
@@ -2959,6 +3002,8 @@ void Scene6100::Action4::signal() {
scene->showMessage(NULL, 0, NULL);
remove();
break;
+ default:
+ break;
}
}
@@ -3055,6 +3100,8 @@ void Scene6100::Action5::dispatch() {
scene->_probe.setAction(NULL);
scene->setAction(&scene->_action3);
break;
+ default:
+ break;
}
g_globals->_scenePalette.clearListeners();
@@ -3098,6 +3145,9 @@ void Scene6100::GetBoxAction::signal() {
scene->showMessage(NULL, 0, NULL);
g_globals->_sceneManager.changeScene(2320);
remove();
+ break;
+ default:
+ break;
}
}
@@ -3131,6 +3181,8 @@ void Scene6100::Action7::signal() {
g_globals->_sceneManager.changeScene(2100);
remove();
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/ringworld/ringworld_scenes10.cpp b/engines/tsage/ringworld/ringworld_scenes10.cpp
index b42b62a4b5..eb8a3173af 100644
--- a/engines/tsage/ringworld/ringworld_scenes10.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes10.cpp
@@ -1255,6 +1255,8 @@ void Scene9700::signal() {
g_globals->_soundHandler.play(323);
g_globals->_sceneManager.changeScene(9750);
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/ringworld/ringworld_scenes2.cpp b/engines/tsage/ringworld/ringworld_scenes2.cpp
index 6811d3c3e8..aeaa9d6818 100644
--- a/engines/tsage/ringworld/ringworld_scenes2.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes2.cpp
@@ -66,6 +66,8 @@ void Scene1000::Action1::signal() {
case 3:
g_globals->_sceneManager.changeScene(1400);
break;
+ default:
+ break;
}
}
@@ -509,6 +511,8 @@ void Scene1001::Action1::signal() {
case 24:
g_globals->_sceneManager.changeScene(2000);
break;
+ default:
+ break;
}
}
@@ -551,6 +555,8 @@ void Scene1250::Action1::signal() {
scene->_object1.animate(ANIM_MODE_5, this);
_actionIndex = 0;
break;
+ default:
+ break;
}
}
@@ -569,6 +575,8 @@ void Scene1250::Action2::signal() {
case 2:
scene->_object2.setPosition(Common::Point(267, 20));
break;
+ default:
+ break;
}
setDelay(30);
@@ -577,6 +585,8 @@ void Scene1250::Action2::signal() {
scene->_object2.animate(ANIM_MODE_5, this);
_actionIndex = 0;
break;
+ default:
+ break;
}
}
@@ -596,6 +606,8 @@ void Scene1250::Action3::signal() {
case 3:
g_globals->_sceneManager.changeScene(1000);
break;
+ default:
+ break;
}
}
@@ -615,6 +627,8 @@ void Scene1250::Action4::signal() {
case 3:
g_globals->_sceneManager.changeScene(2000);
break;
+ default:
+ break;
}
}
@@ -742,6 +756,8 @@ void Scene1400::Action1::signal() {
g_globals->_sceneManager.changeScene(1500);
break;
+ default:
+ break;
}
}
@@ -863,6 +879,8 @@ void Scene1500::Action1::signal() {
g_globals->_soundHandler.play(127);
g_globals->_sceneManager.changeScene(2000);
break;
+ default:
+ break;
}
}
@@ -901,6 +919,8 @@ void Scene1500::Action2::signal() {
g_globals->_stripNum = 1505;
g_globals->_sceneManager.changeScene(2400);
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/ringworld/ringworld_scenes3.cpp b/engines/tsage/ringworld/ringworld_scenes3.cpp
index b112bf6b4f..c91680ab11 100644
--- a/engines/tsage/ringworld/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes3.cpp
@@ -52,6 +52,8 @@ void Scene2000::Action1::signal() {
g_globals->_stripNum = 0;
g_globals->_sceneManager.changeScene(1250);
break;
+ default:
+ break;
}
}
@@ -72,6 +74,8 @@ void Scene2000::Action2::signal() {
setDelay(g_globals->_randomSource.getRandomNumber(179) + 60);
_actionIndex = g_globals->_randomSource.getRandomNumber(1);
break;
+ default:
+ break;
}
}
@@ -88,6 +92,8 @@ void Scene2000::Action3::signal() {
setDelay(g_globals->_randomSource.getRandomNumber(179) + 60);
_actionIndex = 0;
break;
+ default:
+ break;
}
}
@@ -104,6 +110,8 @@ void Scene2000::Action4::signal() {
setDelay(g_globals->_randomSource.getRandomNumber(179) + 60);
_actionIndex = 0;
break;
+ default:
+ break;
}
}
@@ -120,6 +128,8 @@ void Scene2000::Action5::signal() {
setDelay(g_globals->_randomSource.getRandomNumber(125) + 300);
_actionIndex = 0;
break;
+ default:
+ break;
}
}
@@ -154,6 +164,8 @@ void Scene2000::Action6::signal() {
scene->_object6.remove();
g_globals->_sceneManager.changeScene(1001);
break;
+ default:
+ break;
}
}
@@ -173,6 +185,8 @@ void Scene2000::Action7::signal() {
case 3:
g_globals->_sceneManager.changeScene(2222);
break;
+ default:
+ break;
}
}
@@ -193,6 +207,8 @@ void Scene2000::Action8::signal() {
g_globals->_stripNum = 2005;
g_globals->_sceneManager.changeScene(1000);
break;
+ default:
+ break;
}
}
@@ -213,6 +229,8 @@ void Scene2000::Action9::signal() {
g_globals->_stripNum = 2008;
g_globals->_sceneManager.changeScene(9999);
break;
+ default:
+ break;
}
}
@@ -233,6 +251,8 @@ void Scene2000::Action10::signal() {
g_globals->_stripNum = 0;
g_globals->_sceneManager.changeScene(9999);
break;
+ default:
+ break;
}
}
@@ -253,6 +273,8 @@ void Scene2000::Action11::signal() {
g_globals->_stripNum = 0;
g_globals->_sceneManager.changeScene(1400);
break;
+ default:
+ break;
}
}
@@ -274,6 +296,8 @@ void Scene2000::Action12::signal() {
case 3:
g_globals->_sceneManager.changeScene(2300);
break;
+ default:
+ break;
}
}
@@ -292,6 +316,8 @@ void Scene2000::Action13::signal() {
g_globals->_stripNum = 2751;
g_globals->_sceneManager.changeScene(1500);
break;
+ default:
+ break;
}
}
@@ -346,6 +372,8 @@ void Scene2000::Action14::signal() {
g_globals->_stripNum = 1250;
g_globals->_sceneManager.changeScene(1000);
break;
+ default:
+ break;
}
}
@@ -476,6 +504,8 @@ void Scene2000::stripCallback(int v) {
_object9.setFrame(1);
_object9.animate(ANIM_MODE_5, NULL);
break;
+ default:
+ break;
}
}
@@ -585,6 +615,8 @@ void Scene2100::Action1::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -606,6 +638,8 @@ void Scene2100::Action2::signal() {
scene->_object3.animate(ANIM_MODE_6, this);
_actionIndex = 0;
break;
+ default:
+ break;
}
}
@@ -624,6 +658,8 @@ void Scene2100::Action3::signal() {
scene->_object2.animate(ANIM_MODE_6, this);
_actionIndex = 0;
break;
+ default:
+ break;
}
}
@@ -653,6 +689,8 @@ void Scene2100::Action4::signal() {
case 3:
g_globals->_sceneManager.changeScene(2120);
break;
+ default:
+ break;
}
}
@@ -680,6 +718,8 @@ void Scene2100::Action5::signal() {
case 4:
g_globals->_sceneManager.changeScene(3700);
break;
+ default:
+ break;
}
}
@@ -713,6 +753,8 @@ void Scene2100::Action6::signal() {
case 2:
remove();
break;
+ default:
+ break;
}
}
@@ -732,6 +774,8 @@ void Scene2100::Action7::signal() {
case 3:
g_globals->_sceneManager.changeScene(8100);
break;
+ default:
+ break;
}
}
@@ -764,6 +808,8 @@ void Scene2100::Action8::signal() {
remove();
}
break;
+ default:
+ break;
}
}
@@ -804,6 +850,8 @@ void Scene2100::Action9::signal() {
else
setAction(&scene->_action11);
break;
+ default:
+ break;
}
}
@@ -890,6 +938,8 @@ void Scene2100::Action10::signal() {
g_globals->_stripNum = 2101;
g_globals->_sceneManager.changeScene(2320);
break;
+ default:
+ break;
}
}
@@ -958,6 +1008,8 @@ void Scene2100::Action11::signal() {
g_globals->_player.enableControl();
g_globals->_player._canWalk = false;
break;
+ default:
+ break;
}
}
@@ -1043,6 +1095,8 @@ void Scene2100::Action12::signal() {
}
remove();
break;
+ default:
+ break;
}
}
@@ -1078,6 +1132,8 @@ void Scene2100::Action13::signal() {
case 4:
remove();
break;
+ default:
+ break;
}
}
@@ -1163,6 +1219,8 @@ void Scene2100::Action14::signal() {
g_globals->_sceneManager.changeScene(7000);
remove();
break;
+ default:
+ break;
}
}
@@ -1228,6 +1286,8 @@ void Scene2100::Action15::signal() {
case 7:
remove();
break;
+ default:
+ break;
}
}
@@ -1277,6 +1337,8 @@ void Scene2100::Action16::signal() {
g_globals->_sceneManager.changeScene(7000);
remove();
break;
+ default:
+ break;
}
}
@@ -1320,6 +1382,8 @@ void Scene2100::Action17::signal() {
g_globals->_sceneManager.changeScene(9100);
remove();
break;
+ default:
+ break;
}
}
@@ -1927,6 +1991,8 @@ void Scene2100::stripCallback(int v) {
case 2:
_object4.animate(ANIM_MODE_NONE, NULL);
break;
+ default:
+ break;
}
}
@@ -1959,6 +2025,8 @@ void Scene2100::signal() {
case 2112:
g_globals->_player.enableControl();
break;
+ default:
+ break;
}
}
@@ -2044,6 +2112,8 @@ void Scene2120::Action1::signal() {
SET_KEEP_ONSCREEN, -1, SET_TEXT_MODE, 0, LIST_END);
_actionIndex = 4;
break;
+ default:
+ break;
}
}
@@ -2133,6 +2203,8 @@ void Scene2120::Action1::dispatch() {
setDelay(30);
}
break;
+ default:
+ break;
}
scene->_soundHandler.play(159);
@@ -2317,6 +2389,8 @@ void Scene2150::Action1::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -2378,6 +2452,8 @@ void Scene2150::Action2::signal() {
remove();
break;
+ default:
+ break;
}
}
@@ -2628,6 +2704,8 @@ void Scene2150::signal() {
case 2156:
g_globals->_sceneManager.changeScene(2280);
break;
+ default:
+ break;
}
}
@@ -2675,6 +2753,8 @@ void Scene2200::Action1::signal() {
g_globals->_sceneManager.changeScene(2150);
remove();
break;
+ default:
+ break;
}
}
@@ -2705,6 +2785,8 @@ void Scene2200::Action2::signal() {
g_globals->_player._uiEnabled = true;
remove();
break;
+ default:
+ break;
}
}
@@ -2796,6 +2878,8 @@ void Scene2200::Action3::signal() {
g_globals->_sceneManager.changeScene(2000);
remove();
break;
+ default:
+ break;
}
}
@@ -2828,6 +2912,8 @@ void Scene2200::Action4::signal() {
g_globals->_player._uiEnabled = true;
remove();
break;
+ default:
+ break;
}
}
@@ -3016,6 +3102,8 @@ void Scene2200::stripCallback(int v) {
_hotspot4.setStrip(4);
_hotspot4.animate(ANIM_MODE_NONE, NULL);
break;
+ default:
+ break;
}
}
@@ -3059,6 +3147,8 @@ void Scene2222::Action1::signal() {
case 3:
g_globals->_sceneManager.changeScene(1000);
break;
+ default:
+ break;
}
}
@@ -3079,6 +3169,8 @@ void Scene2222::Action2::signal() {
g_globals->_sceneManager._fadeMode = FADEMODE_GRADUAL;
g_globals->_sceneManager.changeScene(2100);
break;
+ default:
+ break;
}
}
@@ -3194,6 +3286,8 @@ void Scene2230::Action1::signal() {
case 5:
g_globals->_sceneManager.changeScene(2150);
break;
+ default:
+ break;
}
}
@@ -3237,6 +3331,8 @@ void Scene2230::Action2::signal() {
g_globals->_events.setCursor(CURSOR_USE);
remove();
break;
+ default:
+ break;
}
}
@@ -3274,16 +3370,23 @@ void Scene2230::Action3::signal() {
g_globals->_events.setCursor(CURSOR_USE);
remove();
+ break;
+ default:
+ break;
}
}
void Scene2230::Action4::signal() {
switch (_actionIndex++) {
case 0:
- Common::Point pt(190 + g_globals->_randomSource.getRandomNumber(9), 68);
- NpcMover *mover = new NpcMover();
- g_globals->_player.addMover(mover, &pt, this);
- _actionIndex = 0;
+ {
+ Common::Point pt(190 + g_globals->_randomSource.getRandomNumber(9), 68);
+ NpcMover *mover = new NpcMover();
+ g_globals->_player.addMover(mover, &pt, this);
+ _actionIndex = 0;
+ }
+ break;
+ default:
break;
}
}
@@ -3322,6 +3425,8 @@ void Scene2230::Action5::signal() {
scene->_sceneMode = 2;
remove();
break;
+ default:
+ break;
}
}
@@ -3343,6 +3448,8 @@ void Scene2230::Action6::signal() {
g_globals->_player.animate(ANIM_MODE_1, NULL);
remove();
break;
+ default:
+ break;
}
}
@@ -3399,6 +3506,8 @@ void Scene2230::Action7::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -3470,6 +3579,8 @@ void Scene2230::Action8::signal() {
remove();
break;
+ default:
+ break;
}
}
@@ -3799,6 +3910,8 @@ void Scene2280::Action1::signal() {
case 5:
g_globals->_sceneManager.changeScene(7000);
break;
+ default:
+ break;
}
}
@@ -3847,6 +3960,8 @@ void Scene2280::Action2::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -3915,6 +4030,8 @@ void Scene2280::Action3::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -3938,6 +4055,8 @@ void Scene2280::Action4::signal() {
g_globals->_player.addMover(mover, &pt, this);
break;
}
+ default:
+ break;
}
break;
}
@@ -3983,6 +4102,8 @@ void Scene2280::Action4::signal() {
RING_INVENTORY._scanner._sceneNumber = 2280;
g_globals->_sceneItems.push_front(&scene->_hotspot18);
break;
+ default:
+ break;
}
g_globals->_player.animate(ANIM_MODE_6, this);
@@ -3995,6 +4116,8 @@ void Scene2280::Action4::signal() {
remove();
break;
+ default:
+ break;
}
}
@@ -4519,6 +4642,8 @@ void Scene2300::Action1::signal() {
g_globals->_sceneManager.changeScene(2000);
remove();
break;
+ default:
+ break;
}
}
@@ -4586,6 +4711,8 @@ void Scene2300::Action2::signal() {
case 10:
g_globals->_sceneManager.changeScene(2310);
break;
+ default:
+ break;
}
}
@@ -4639,6 +4766,8 @@ void Scene2300::Action3::signal() {
case 6:
g_globals->_sceneManager.changeScene(2310);
break;
+ default:
+ break;
}
}
@@ -4676,6 +4805,8 @@ void Scene2300::Action4::signal() {
scene->_soundHandler1.play(13);
remove();
break;
+ default:
+ break;
}
}
@@ -4936,6 +5067,8 @@ void Scene2310::signal() {
g_globals->_sceneManager.changeScene(2200);
break;
}
+ default:
+ break;
}
}
@@ -5057,6 +5190,8 @@ void Scene2320::Action1::signal() {
setDelay(120);
_actionIndex = 3;
break;
+ default:
+ break;
}
}
@@ -5077,6 +5212,8 @@ void Scene2320::Action2::signal() {
scene->_hotspot13.hide();
remove();
break;
+ default:
+ break;
}
}
@@ -5172,6 +5309,8 @@ void Scene2320::Action3::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -5330,6 +5469,8 @@ void Scene2320::Action4::signal() {
scene->_hotspot13.fixPriority(1);
remove();
break;
+ default:
+ break;
}
}
@@ -5392,6 +5533,8 @@ void Scene2320::Action5::signal() {
case 8:
g_globals->_sceneManager.changeScene(4000);
break;
+ default:
+ break;
}
}
@@ -5454,6 +5597,8 @@ void Scene2320::Action6::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -5512,6 +5657,8 @@ void Scene2320::Action7::signal() {
g_globals->_player.enableControl();
RING_INVENTORY._stasisBox._sceneNumber = 2320;
break;
+ default:
+ break;
}
}
@@ -5545,6 +5692,8 @@ void Scene2320::Action8::signal() {
scene->_speakerGameText.setTextPos(Common::Point(g_globals->_sceneManager._scene->_sceneBounds.left + 30, 10));
scene->setAction(&scene->_sequenceManager1, scene, 2326, &g_globals->_player, &scene->_hotspot11, NULL);
break;
+ default:
+ break;
}
}
@@ -6070,6 +6219,8 @@ void Scene2320::signal() {
case 5000:
g_globals->_player.enableControl();
break;
+ default:
+ break;
}
}
@@ -6103,6 +6254,8 @@ void Scene2400::Action1::signal() {
case 6:
g_globals->_sceneManager.changeScene(4000);
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/ringworld/ringworld_scenes4.cpp b/engines/tsage/ringworld/ringworld_scenes4.cpp
index 4d40b34eea..82c9462ba3 100644
--- a/engines/tsage/ringworld/ringworld_scenes4.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes4.cpp
@@ -51,6 +51,8 @@ void Scene3500::Action1::signal() {
case 3:
g_globals->_sceneManager.changeScene(9999);
break;
+ default:
+ break;
}
}
@@ -70,6 +72,8 @@ void Scene3500::Action2::signal() {
case 3:
g_globals->_sceneManager.changeScene(2012);
break;
+ default:
+ break;
}
}
@@ -224,6 +228,8 @@ void Scene3700::Action1::signal() {
case 9:
g_globals->_sceneManager.changeScene(2100);
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/ringworld/ringworld_scenes5.cpp b/engines/tsage/ringworld/ringworld_scenes5.cpp
index 93951370a9..0f869f03da 100644
--- a/engines/tsage/ringworld/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes5.cpp
@@ -126,6 +126,8 @@ void Scene4000::Action1::signal() {
g_globals->setFlag(96);
g_globals->_sceneManager.changeScene(4025);
break;
+ default:
+ break;
}
}
@@ -183,6 +185,8 @@ void Scene4000::Action2::signal() {
case 7:
g_globals->_sceneManager.changeScene(4045);
break;
+ default:
+ break;
}
}
@@ -202,6 +206,8 @@ void Scene4000::Action3::signal() {
scene->_hotspot8.remove();
remove();
break;
+ default:
+ break;
}
}
@@ -241,6 +247,8 @@ void Scene4000::Action4::signal() {
g_globals->setFlag(41);
remove();
break;
+ default:
+ break;
}
}
@@ -268,6 +276,8 @@ void Scene4000::Action5::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -306,6 +316,8 @@ void Scene4000::Action6::signal() {
case 5:
g_globals->_sceneManager.changeScene(4100);
break;
+ default:
+ break;
}
}
@@ -331,6 +343,8 @@ void Scene4000::Action7::signal() {
case 2:
g_globals->_sceneManager.changeScene(4050);
break;
+ default:
+ break;
}
}
@@ -372,6 +386,8 @@ void Scene4000::Action8::signal() {
g_globals->_game->endGame(4000, 15);
remove();
break;
+ default:
+ break;
}
}
@@ -385,6 +401,8 @@ void Scene4000::Action9::signal() {
static_cast<SceneObject *>(_owner)->animate(ANIM_MODE_8, 1, this);
_actionIndex = 0;
break;
+ default:
+ break;
}
}
@@ -398,6 +416,8 @@ void Scene4000::Action10::signal() {
static_cast<SceneObject *>(_owner)->animate(ANIM_MODE_8, 1, this);
_actionIndex = 0;
break;
+ default:
+ break;
}
}
@@ -444,6 +464,8 @@ void Scene4000::Action11::signal() {
case 6:
g_globals->_sceneManager.changeScene(4250);
break;
+ default:
+ break;
}
}
@@ -486,6 +508,8 @@ void Scene4000::Action12::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -507,6 +531,8 @@ void Scene4000::Action13::signal() {
scene->_soundHandler2.release();
g_globals->_sceneManager.changeScene(4010);
break;
+ default:
+ break;
}
}
@@ -1207,6 +1233,8 @@ void Scene4000::signal() {
case 4015:
ADD_MOVER_NULL(_miranda, 0, _miranda._position.y - 5);
break;
+ default:
+ break;
}
}
@@ -1371,6 +1399,9 @@ void Scene4025::Action1::signal() {
g_globals->_events.setCursor(CURSOR_USE);
remove();
break;
+
+ default:
+ break;
}
}
@@ -1415,6 +1446,8 @@ void Scene4025::Action2::signal() {
g_globals->_events.setCursor(CURSOR_USE);
remove();
break;
+ default:
+ break;
}
}
@@ -1430,6 +1463,8 @@ void Scene4025::Action3::signal() {
g_globals->_stripNum = 4025;
g_globals->_sceneManager.changeScene(4000);
break;
+ default:
+ break;
}
}
@@ -1476,6 +1511,8 @@ void Scene4025::Hole::doAction(int action) {
scene->setAction(&scene->_sequenceManager, scene, 4027, NULL);
}
break;
+ default:
+ break;
}
}
@@ -1497,6 +1534,8 @@ void Scene4025::Peg::doAction(int action) {
scene->_pegPtr = this;
scene->setAction(&scene->_action1);
break;
+ default:
+ break;
}
}
@@ -1701,6 +1740,8 @@ void Scene4045::Action1::signal() {
g_globals->_sceneManager.changeScene(4000);
remove();
break;
+ default:
+ break;
}
}
@@ -1731,6 +1772,8 @@ void Scene4045::Action2::signal() {
g_globals->setFlag(39);
g_globals->_sceneManager.changeScene(4000);
break;
+ default:
+ break;
}
}
@@ -1754,6 +1797,8 @@ void Scene4045::Action3::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -1977,6 +2022,8 @@ void Scene4045::stripCallback(int v) {
case 2:
_olloFace.animate(ANIM_MODE_NONE, NULL);
break;
+ default:
+ break;
}
}
@@ -1992,6 +2039,8 @@ void Scene4045::signal() {
case 4102:
g_globals->_player.enableControl();
break;
+ default:
+ break;
}
}
@@ -2059,6 +2108,8 @@ void Scene4050::Action1::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -2096,6 +2147,8 @@ void Scene4050::Action2::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -2125,6 +2178,8 @@ void Scene4050::Action3::signal() {
g_globals->_stripNum = 4050;
g_globals->_sceneManager.changeScene(4000);
break;
+ default:
+ break;
}
}
@@ -2195,6 +2250,8 @@ void Scene4050::Action4::signal() {
case 9:
g_globals->_sceneManager.changeScene(4000);
break;
+ default:
+ break;
}
}
@@ -2379,6 +2436,8 @@ void Scene4100::Action1::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -2409,6 +2468,8 @@ void Scene4100::Action2::signal() {
case 3:
remove();
break;
+ default:
+ break;
}
}
@@ -2470,6 +2531,8 @@ void Scene4100::Action4::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -2497,6 +2560,8 @@ void Scene4100::Action5::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -2514,6 +2579,8 @@ void Scene4100::Action6::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -2767,6 +2834,8 @@ void Scene4100::signal() {
case 4109:
g_globals->_player.enableControl();
break;
+ default:
+ break;
}
}
@@ -2877,6 +2946,8 @@ void Scene4150::Action1::signal() {
remove();
break;
+ default:
+ break;
}
}
@@ -2905,6 +2976,8 @@ void Scene4150::Action2::signal() {
case 3:
remove();
break;
+ default:
+ break;
}
}
@@ -2934,6 +3007,8 @@ void Scene4150::Action3::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -2949,6 +3024,8 @@ void Scene4150::HotspotGroup1::doAction(int action) {
case OBJECT_ROPE:
scene->setAction(&scene->_action3);
break;
+ default:
+ break;
}
}
@@ -2961,6 +3038,8 @@ void Scene4150::HotspotGroup3::doAction(int action) {
case CURSOR_USE:
SceneItem::display2(4150, 30);
break;
+ default:
+ break;
}
}
@@ -2973,6 +3052,8 @@ void Scene4150::HotspotGroup6::doAction(int action) {
case CURSOR_USE:
SceneItem::display2(4150, 31);
break;
+ default:
+ break;
}
}
@@ -3163,6 +3244,8 @@ void Scene4250::Action1::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -3219,6 +3302,8 @@ void Scene4250::Action2::signal() {
g_globals->clearFlag(43);
g_globals->_sceneManager.changeScene(2100);
break;
+ default:
+ break;
}
}
@@ -3236,6 +3321,8 @@ void Scene4250::Action3::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -3258,6 +3345,8 @@ void Scene4250::Action4::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -3288,6 +3377,8 @@ void Scene4250::Action5::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -3805,6 +3896,8 @@ void Scene4300::Action1::signal() {
remove();
break;
+ default:
+ break;
}
}
@@ -3822,6 +3915,8 @@ void Scene4300::Action2::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -3993,6 +4088,8 @@ void Scene4300::Hotspot17::doAction(int action) {
scene->setAction(&scene->_sequenceManager, scene, 4303, this, NULL);
break;
+ default:
+ break;
}
}
@@ -4166,6 +4263,8 @@ void Scene4300::stripCallback(int v) {
case 2:
_hotspot12.hide();
break;
+ default:
+ break;
}
}
@@ -4201,6 +4300,8 @@ void Scene4300::signal() {
g_globals->_player.enableControl();
g_globals->_scenePalette.addRotation(240, 254, -1);
break;
+ default:
+ break;
}
}
@@ -4321,6 +4422,8 @@ void Scene4301::Action1::signal() {
scene->_puzzleDone = true;
remove();
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/ringworld/ringworld_scenes6.cpp b/engines/tsage/ringworld/ringworld_scenes6.cpp
index ba6471dbf0..20b9789a10 100644
--- a/engines/tsage/ringworld/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes6.cpp
@@ -84,6 +84,8 @@ void Scene5000::Action1::signal() {
case 9:
scene->setAction(&scene->_action2);
break;
+ default:
+ break;
}
}
@@ -184,6 +186,8 @@ void Scene5000::Action2::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -258,6 +262,8 @@ void Scene5000::Action3::signal() {
scene->_hotspot7.setStrip(2);
remove();
break;
+ default:
+ break;
}
}
@@ -314,6 +320,8 @@ void Scene5000::Action4::signal() {
g_globals->_sceneManager.changeScene(2320);
remove();
break;
+ default:
+ break;
}
}
@@ -342,6 +350,9 @@ void Scene5000::Action5::signal() {
g_globals->_player.enableControl();
remove();
+ break;
+ default:
+ break;
}
}
@@ -373,6 +384,8 @@ void Scene5000::Action6::signal() {
case 5:
g_globals->_sceneManager.changeScene(2100);
break;
+ default:
+ break;
}
}
@@ -576,6 +589,8 @@ void Scene5000::signal() {
case 5005:
g_globals->_sceneManager.changeScene(5100);
break;
+ default:
+ break;
}
}
@@ -662,6 +677,8 @@ void Scene5100::Action1::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -712,6 +729,8 @@ void Scene5100::Action2::signal() {
case 5:
g_globals->_sceneManager.changeScene(2100);
break;
+ default:
+ break;
}
}
@@ -779,6 +798,8 @@ void Scene5100::Action3::signal() {
g_globals->_player.animate(ANIM_MODE_1, NULL);
remove();
break;
+ default:
+ break;
}
}
@@ -808,6 +829,8 @@ void Scene5100::Action4::signal() {
case 3:
g_globals->_sceneManager.changeScene(5200);
break;
+ default:
+ break;
}
}
@@ -830,6 +853,8 @@ void Scene5100::Action5::signal() {
scene->_sceneMode = 5106;
scene->setAction(&scene->_sequenceManager, scene, 5106, &g_globals->_player, &scene->_hotspot14, NULL);
break;
+ default:
+ break;
}
}
@@ -1259,6 +1284,8 @@ void Scene5100::postInit(SceneObjectList *OwnerList) {
g_globals->_player.setPosition(Common::Point(512, 190));
setAction(&_action2);
break;
+ default:
+ break;
}
if (g_globals->getFlag(108)) {
@@ -1378,6 +1405,8 @@ void Scene5100::signal() {
g_globals->clearFlag(60);
g_globals->_sceneManager.changeScene(5300);
break;
+ default:
+ break;
}
}
@@ -1454,6 +1483,8 @@ void Scene5200::Action1::signal() {
scene->_hotspot3.animate(ANIM_MODE_8, 1, this);
_actionIndex = 0;
break;
+ default:
+ break;
}
}
@@ -1498,6 +1529,8 @@ void Scene5200::Action2::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -1514,6 +1547,8 @@ void Scene5200::Action3::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -1543,6 +1578,8 @@ void Scene5200::Action4::signal() {
case 6:
g_globals->_sceneManager.changeScene(5100);
break;
+ default:
+ break;
}
}
@@ -1593,6 +1630,8 @@ void Scene5200::Hotspot14::doAction(int action) {
case CURSOR_USE:
scene->setAction(&scene->_action2);
break;
+ default:
+ break;
}
}
@@ -1731,6 +1770,8 @@ void Scene5200::stripCallback(int v) {
case 2:
_hotspot7.animate(ANIM_MODE_NONE, NULL);
break;
+ default:
+ break;
}
}
@@ -1795,6 +1836,8 @@ void Scene5300::Action1::signal() {
}
}
break;
+ default:
+ break;
}
}
@@ -1823,6 +1866,8 @@ void Scene5300::Action2::signal() {
g_globals->_sceneManager.changeScene(5100);
remove();
break;
+ default:
+ break;
}
}
@@ -1841,6 +1886,8 @@ void Scene5300::Action3::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -2200,6 +2247,8 @@ void Scene5300::signal() {
g_globals->_stripNum = 5302;
g_globals->_sceneManager.changeScene(5100);
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/ringworld/ringworld_scenes8.cpp b/engines/tsage/ringworld/ringworld_scenes8.cpp
index 8bbbba98d9..04c45fc9aa 100644
--- a/engines/tsage/ringworld/ringworld_scenes8.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes8.cpp
@@ -89,6 +89,8 @@ void Scene7000::Action1::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -116,6 +118,8 @@ void Scene7000::Action2::signal() {
g_globals->_sceneManager.changeScene(7100);
remove();
break;
+ default:
+ break;
}
}
@@ -172,6 +176,8 @@ void Scene7000::Action3::signal() {
g_globals->_sceneManager.changeScene(2100);
remove();
break;
+ default:
+ break;
}
}
@@ -203,6 +209,8 @@ void Scene7000::Action4::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -262,6 +270,8 @@ void Scene7000::Action5::signal() {
g_globals->clearFlag(13);
g_globals->_sceneManager.changeScene(2100);
break;
+ default:
+ break;
}
}
@@ -310,6 +320,8 @@ void Scene7000::Action6::signal() {
g_globals->_player.setFrame(1);
remove();
break;
+ default:
+ break;
}
}
@@ -355,6 +367,8 @@ void Scene7000::Action7::signal() {
else
g_globals->_sceneManager.changeScene(2320);
break;
+ default:
+ break;
}
}
@@ -657,6 +671,8 @@ void Scene7000::signal() {
case 7015:
setAction(&_action4);
break;
+ default:
+ break;
}
}
@@ -683,6 +699,8 @@ void Scene7100::Action3::signal() {
scene->_object4.remove();
remove();
break;
+ default:
+ break;
}
}
@@ -711,6 +729,8 @@ void Scene7100::Action4::signal() {
_actionIndex = 0;
setDelay(1);
break;
+ default:
+ break;
}
}
@@ -745,7 +765,10 @@ void Scene7100::Action5::signal() {
case 4: {
scene->_object9.remove();
remove();
+ break;
}
+ default:
+ break;
}
}
@@ -801,6 +824,8 @@ void Scene7100::Action6::signal() {
_actionIndex = 0;
setDelay(1);
break;
+ default:
+ break;
}
}
@@ -829,6 +854,8 @@ void Scene7100::Action7::signal() {
_actionIndex = 0;
setDelay(1);
break;
+ default:
+ break;
}
}
@@ -927,6 +954,8 @@ void Scene7100::Action8::signal() {
_actionIndex = 0;
break;
}
+ default:
+ break;
}
}
@@ -972,6 +1001,8 @@ void Scene7100::Action9::signal() {
setDelay(1);
break;
}
+ default:
+ break;
}
}
@@ -992,6 +1023,8 @@ void Scene7100::Action10::signal() {
scene->_object25.remove();
remove();
break;
+ default:
+ break;
}
}
@@ -1020,6 +1053,8 @@ void Scene7100::Action11::signal() {
g_globals->_sceneManager.changeScene(7200);
remove();
break;
+ default:
+ break;
}
}
@@ -1171,7 +1206,9 @@ void Scene7200::Action1::signal() {
case 3:
g_globals->_sceneManager.changeScene(7300);
remove();
- break;
+ break;
+ default:
+ break;
}
}
@@ -1224,7 +1261,9 @@ void Scene7200::Action2::signal() {
_actionIndex = 0;
setDelay(1);
remove();
- break;
+ break;
+ default:
+ break;
}
}
@@ -1355,6 +1394,8 @@ void Scene7300::Action1::signal() {
case 8:
g_globals->_sceneManager.changeScene(2280);
break;
+ default:
+ break;
}
}
@@ -1368,10 +1409,14 @@ void Scene7300::Action2::signal() {
setDelay(5);
break;
case 1:
- NpcMover *mover1 = new NpcMover();
- Common::Point pt(g_globals->_randomSource.getRandomNumber(3) + 203, g_globals->_randomSource.getRandomNumber(3) + 96);
- scene->_object3.addMover(mover1, &pt, this);
- _actionIndex = 0;
+ {
+ NpcMover *mover1 = new NpcMover();
+ Common::Point pt(g_globals->_randomSource.getRandomNumber(3) + 203, g_globals->_randomSource.getRandomNumber(3) + 96);
+ scene->_object3.addMover(mover1, &pt, this);
+ _actionIndex = 0;
+ }
+ break;
+ default:
break;
}
}
@@ -1386,10 +1431,14 @@ void Scene7300::Action3::signal() {
setDelay(5);
break;
case 1:
- NpcMover *mover1 = new NpcMover();
- Common::Point pt(g_globals->_randomSource.getRandomNumber(5) + 76, g_globals->_randomSource.getRandomNumber(5) + 78);
- scene->_object1.addMover(mover1, &pt, this);
- _actionIndex = 0;
+ {
+ NpcMover *mover1 = new NpcMover();
+ Common::Point pt(g_globals->_randomSource.getRandomNumber(5) + 76, g_globals->_randomSource.getRandomNumber(5) + 78);
+ scene->_object1.addMover(mover1, &pt, this);
+ _actionIndex = 0;
+ }
+ break;
+ default:
break;
}
}
@@ -1404,6 +1453,8 @@ void Scene7300::Action4::signal() {
case 1:
_actionIndex = 0;
break;
+ default:
+ break;
}
}
@@ -1525,6 +1576,8 @@ void Scene7600::Action1::signal() {
case 2:
g_globals->_sceneManager.changeScene(7700);
break;
+ default:
+ break;
}
}
@@ -1545,6 +1598,8 @@ void Scene7600::Action2::signal() {
g_globals->_sceneManager.changeScene(2320);
remove();
break;
+ default:
+ break;
}
}
@@ -1635,6 +1690,8 @@ void Scene7700::Action1::signal() {
case 2:
remove();
break;
+ default:
+ break;
}
}
@@ -1653,6 +1710,8 @@ void Scene7700::Action2::signal() {
scene->_prof.animate(ANIM_MODE_6, this);
_actionIndex = 0;
break;
+ default:
+ break;
}
}
@@ -1682,6 +1741,8 @@ void Scene7700::Action3::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -1708,6 +1769,8 @@ void Scene7700::Action4::signal() {
g_globals->_player.enableControl();
remove();
break;
+ default:
+ break;
}
}
@@ -1727,6 +1790,8 @@ void Scene7700::Action5::signal() {
_actionIndex = 0;
break;
}
+ default:
+ break;
}
}
@@ -1759,6 +1824,8 @@ void Scene7700::Action6::signal() {
scene->_easterEgg2.remove();
remove();
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.cpp b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
index 5cd124f91d..e5226c7e62 100644
--- a/engines/tsage/ringworld2/ringworld2_dialogs.cpp
+++ b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
@@ -182,6 +182,8 @@ int RightClickDialog::execute() {
// Options dialog
result = 1;
break;
+ default:
+ break;
}
R2_GLOBALS._events.setCursor(cursorNum);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index a9f879f84b..b162dc2e8b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1422,6 +1422,9 @@ void Scene160::Action1::signal() {
HelpDialog::show();
setDelay(4);
break;
+
+ default:
+ break;
}
}
@@ -1506,6 +1509,8 @@ void Scene180::Action1::signal() {
scene->_shipDisplay.animate(ANIM_MODE_5, this);
_actionIndex = 0;
break;
+ default:
+ break;
}
}
@@ -1895,6 +1900,9 @@ void Scene180::signal() {
// a closeup of Quinn in the floatation bed first
R2_GLOBALS._sceneManager.changeScene(50);
break;
+
+ default:
+ break;
}
}
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 92a64ca9c1..8b6e413ab0 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -454,6 +454,9 @@ void Scene1000::signal() {
R2_GLOBALS._scenePalette.loadPalette(0);
R2_GLOBALS._sceneManager.changeScene(3500);
break;
+
+ default:
+ break;
}
}
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 044bd567d4..4c51513f0b 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -234,6 +234,8 @@ void SoundManager::installDriver(int driverNum) {
}
break;
}
+ default:
+ break;
}
}
@@ -2280,6 +2282,8 @@ void Sound::soDoTrackCommand(int channelNum, int command, int value) {
case 75:
_chNumVoices[channelNum] = value;
break;
+ default:
+ break;
}
}
diff --git a/engines/tsage/user_interface.cpp b/engines/tsage/user_interface.cpp
index d5e40cba83..620d21694a 100644
--- a/engines/tsage/user_interface.cpp
+++ b/engines/tsage/user_interface.cpp
@@ -415,6 +415,8 @@ void UIElements::setup(const Common::Point &pt) {
case 3:
item = &_slot4;
break;
+ default:
+ break;
}
xp = idx * 63 + 2;
@@ -488,6 +490,8 @@ void UIElements::updateInventory(int objectNumber) {
case GType_Ringworld2:
_character.setFrame(R2_GLOBALS._player._characterIndex);
break;
+ default:
+ break;
}
updateInvList();