aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD G Turner2019-12-01 00:59:20 +0000
committerD G Turner2019-12-01 00:59:20 +0000
commitbffb4418bde37804de728a3352f5a55601b4d65f (patch)
tree474f95d9daf70a29e61f38974f5c9f4c5195d13a
parent76bf6da5fa392219670f5f8eb9008698119c5db3 (diff)
downloadscummvm-rg350-bffb4418bde37804de728a3352f5a55601b4d65f.tar.gz
scummvm-rg350-bffb4418bde37804de728a3352f5a55601b4d65f.tar.bz2
scummvm-rg350-bffb4418bde37804de728a3352f5a55601b4d65f.zip
STARTREK: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
-rw-r--r--engines/startrek/awaymission.cpp2
-rw-r--r--engines/startrek/intro.cpp3
-rw-r--r--engines/startrek/menu.cpp5
-rw-r--r--engines/startrek/rooms/demon0.cpp2
-rw-r--r--engines/startrek/rooms/feather1.cpp4
-rw-r--r--engines/startrek/rooms/love1.cpp1
-rw-r--r--engines/startrek/rooms/mudd1.cpp3
-rw-r--r--engines/startrek/rooms/mudd4.cpp6
-rw-r--r--engines/startrek/rooms/tug2.cpp3
-rw-r--r--engines/startrek/rooms/tug3.cpp3
-rw-r--r--engines/startrek/rooms/venga.cpp3
-rw-r--r--engines/startrek/space.cpp4
-rw-r--r--engines/startrek/startrek.cpp7
13 files changed, 46 insertions, 0 deletions
diff --git a/engines/startrek/awaymission.cpp b/engines/startrek/awaymission.cpp
index 0f5f8a8689..08016c158b 100644
--- a/engines/startrek/awaymission.cpp
+++ b/engines/startrek/awaymission.cpp
@@ -356,6 +356,8 @@ void StarTrekEngine::awayMissionLeftClick() {
break;
}
+ default:
+ break;
}
}
diff --git a/engines/startrek/intro.cpp b/engines/startrek/intro.cpp
index 02d7642da2..fe4c6fa5c9 100644
--- a/engines/startrek/intro.cpp
+++ b/engines/startrek/intro.cpp
@@ -172,6 +172,9 @@ void StarTrekEngine::playIntro() {
_gfx->delSprite(&subtitleSprite);
_byte_45b3c = 1;
break;
+
+ default:
+ break;
}
if (!buttonPressed) {
diff --git a/engines/startrek/menu.cpp b/engines/startrek/menu.cpp
index f973f9a95b..a46c717c96 100644
--- a/engines/startrek/menu.cpp
+++ b/engines/startrek/menu.cpp
@@ -140,6 +140,9 @@ void StarTrekEngine::chooseMousePositionFromSprites(Sprite *sprites, int numSpri
mouseY2 = vCenter;
}
break;
+
+ default:
+ break;
}
}
@@ -1002,6 +1005,8 @@ void StarTrekEngine::showTextConfigurationMenu(bool fromOptionMenu) {
case 2:
_textDisplayMode = TEXTDISPLAY_NONE;
break;
+ default:
+ break;
}
}
diff --git a/engines/startrek/rooms/demon0.cpp b/engines/startrek/rooms/demon0.cpp
index 2a16bd5bb1..aa9a3fe57f 100644
--- a/engines/startrek/rooms/demon0.cpp
+++ b/engines/startrek/rooms/demon0.cpp
@@ -172,6 +172,8 @@ void Room::demon0TalkToPrelate() {
case 2:
demon0BadResponse();
break;
+ default:
+ break;
}
if (response != nullptr)
diff --git a/engines/startrek/rooms/feather1.cpp b/engines/startrek/rooms/feather1.cpp
index 5decbf26a6..3dfae5e6b9 100644
--- a/engines/startrek/rooms/feather1.cpp
+++ b/engines/startrek/rooms/feather1.cpp
@@ -508,6 +508,8 @@ void Room::feather1ClimbedUpVine() {
case OBJECT_KIRK:
walkCrewman(OBJECT_KIRK, 0xa0, 0x30);
break;
+ default:
+ break;
}
}
@@ -538,6 +540,8 @@ void Room::feather1ClimbedDownVine() {
case OBJECT_KIRK:
walkCrewman(OBJECT_KIRK, 0x87, 0xba);
break;
+ default:
+ break;
}
}
diff --git a/engines/startrek/rooms/love1.cpp b/engines/startrek/rooms/love1.cpp
index 25d07853a7..f6828053f7 100644
--- a/engines/startrek/rooms/love1.cpp
+++ b/engines/startrek/rooms/love1.cpp
@@ -80,6 +80,7 @@ common:
// fall through
case BOTTLETYPE_NONE:
+ default:
break;
}
diff --git a/engines/startrek/rooms/mudd1.cpp b/engines/startrek/rooms/mudd1.cpp
index 28a5cb3e46..c84afac7d3 100644
--- a/engines/startrek/rooms/mudd1.cpp
+++ b/engines/startrek/rooms/mudd1.cpp
@@ -181,6 +181,9 @@ void Room::mudd1SpockPressedRedButton() {
_awayMission->mudd.torpedoStatus = 1;
showText(TX_SPEAKER_UHURA, TX_STATICU1);
break;
+
+ default:
+ break;
}
}
diff --git a/engines/startrek/rooms/mudd4.cpp b/engines/startrek/rooms/mudd4.cpp
index 9118aff823..232d6daf10 100644
--- a/engines/startrek/rooms/mudd4.cpp
+++ b/engines/startrek/rooms/mudd4.cpp
@@ -145,6 +145,9 @@ void Room::mudd4ShowLeftConsoleMenu() {
_awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_N;
walkCrewman(OBJECT_SPOCK, 0x69, 0xb7);
break;
+
+ default:
+ break;
}
}
@@ -242,6 +245,9 @@ void Room::mudd4ShowRightConsoleMenu() {
_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N;
walkCrewman(OBJECT_KIRK, 0x83, 0xb6);
break;
+
+ default:
+ break;
}
}
diff --git a/engines/startrek/rooms/tug2.cpp b/engines/startrek/rooms/tug2.cpp
index 06c5011683..b3cabaee3b 100644
--- a/engines/startrek/rooms/tug2.cpp
+++ b/engines/startrek/rooms/tug2.cpp
@@ -694,6 +694,9 @@ void Room::tug2Timer0Expired() {
tug2GuardShootsCrewman();
}
break;
+
+ default:
+ break;
}
}
diff --git a/engines/startrek/rooms/tug3.cpp b/engines/startrek/rooms/tug3.cpp
index c16d58eba0..87f08a7545 100644
--- a/engines/startrek/rooms/tug3.cpp
+++ b/engines/startrek/rooms/tug3.cpp
@@ -258,6 +258,9 @@ void Room::tug3TalkToElasi1() {
// BUGFIX: they're going to surrender, so stop the firefight.
_awayMission->timers[0] = 0;
break;
+
+ default:
+ break;
}
}
diff --git a/engines/startrek/rooms/venga.cpp b/engines/startrek/rooms/venga.cpp
index 5efb7316a4..1237997e8c 100644
--- a/engines/startrek/rooms/venga.cpp
+++ b/engines/startrek/rooms/venga.cpp
@@ -128,6 +128,9 @@ void Room::vengaUseMccoyOnDeadGuy() {
case 5:
showText(TX_SPEAKER_MCCOY, TX_VEN0_016);
break;
+
+ default:
+ break;
}
}
diff --git a/engines/startrek/space.cpp b/engines/startrek/space.cpp
index b9b0919738..65f11f30ff 100644
--- a/engines/startrek/space.cpp
+++ b/engines/startrek/space.cpp
@@ -170,6 +170,8 @@ void StarTrekEngine::updateStarfieldAndShips(bool arg0) {
case 3:
r3 = sub_19f24(r3);
break;
+ default:
+ break;
}
if (r3 != nullptr)
@@ -194,6 +196,8 @@ void StarTrekEngine::updateStarfieldAndShips(bool arg0) {
} else
drawR3Shape(r3);
break;
+ default:
+ break;
}
}
}
diff --git a/engines/startrek/startrek.cpp b/engines/startrek/startrek.cpp
index 3c82ea2650..580f604ddf 100644
--- a/engines/startrek/startrek.cpp
+++ b/engines/startrek/startrek.cpp
@@ -197,6 +197,7 @@ Common::Error StarTrekEngine::runGameMode(int mode, bool resume) {
case GAMEMODE_BEAMDOWN:
case GAMEMODE_BEAMUP:
+ default:
break;
}
@@ -227,6 +228,9 @@ Common::Error StarTrekEngine::runGameMode(int mode, bool resume) {
_sound->stopAllVocSounds();
_sound->playVoc("bridloop");
continue; // Back to start of loop
+
+ default:
+ break;
}
}
@@ -245,6 +249,9 @@ Common::Error StarTrekEngine::runGameMode(int mode, bool resume) {
case GAMEMODE_BEAMUP:
error("Can't be here.");
break;
+
+ default:
+ break;
}
}