diff options
author | D G Turner | 2019-12-01 00:59:20 +0000 |
---|---|---|
committer | D G Turner | 2019-12-01 00:59:20 +0000 |
commit | bffb4418bde37804de728a3352f5a55601b4d65f (patch) | |
tree | 474f95d9daf70a29e61f38974f5c9f4c5195d13a /engines/startrek/rooms | |
parent | 76bf6da5fa392219670f5f8eb9008698119c5db3 (diff) | |
download | scummvm-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.
Diffstat (limited to 'engines/startrek/rooms')
-rw-r--r-- | engines/startrek/rooms/demon0.cpp | 2 | ||||
-rw-r--r-- | engines/startrek/rooms/feather1.cpp | 4 | ||||
-rw-r--r-- | engines/startrek/rooms/love1.cpp | 1 | ||||
-rw-r--r-- | engines/startrek/rooms/mudd1.cpp | 3 | ||||
-rw-r--r-- | engines/startrek/rooms/mudd4.cpp | 6 | ||||
-rw-r--r-- | engines/startrek/rooms/tug2.cpp | 3 | ||||
-rw-r--r-- | engines/startrek/rooms/tug3.cpp | 3 | ||||
-rw-r--r-- | engines/startrek/rooms/venga.cpp | 3 |
8 files changed, 25 insertions, 0 deletions
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; } } |