[Scummvm-git-logs] scummvm master -> bffb4418bde37804de728a3352f5a55601b4d65f

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bffb4418bd STARTREK: Fix Missing Default Switch Cases


Commit: bffb4418bde37804de728a3352f5a55601b4d65f
    https://github.com/scummvm/scummvm/commit/bffb4418bde37804de728a3352f5a55601b4d65f
Author: D G Turner (digitall at scummvm.org)
Date: 2019-12-01T00:59:20Z

Commit Message:
STARTREK: Fix Missing Default Switch Cases

These are flagged by GCC if -Wswitch-default is enabled.

Changed paths:
    engines/startrek/awaymission.cpp
    engines/startrek/intro.cpp
    engines/startrek/menu.cpp
    engines/startrek/rooms/demon0.cpp
    engines/startrek/rooms/feather1.cpp
    engines/startrek/rooms/love1.cpp
    engines/startrek/rooms/mudd1.cpp
    engines/startrek/rooms/mudd4.cpp
    engines/startrek/rooms/tug2.cpp
    engines/startrek/rooms/tug3.cpp
    engines/startrek/rooms/venga.cpp
    engines/startrek/space.cpp
    engines/startrek/startrek.cpp


diff --git a/engines/startrek/awaymission.cpp b/engines/startrek/awaymission.cpp
index 0f5f8a8..08016c1 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 02d7642..fe4c6fa 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 f973f9a..a46c717 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 2a16bd5..aa9a3fe 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 5decbf2..3dfae5e 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 25d0785..f682805 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 28a5cb3..c84afac 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 9118aff..232d6da 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 06c5011..b3cabae 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 c16d58e..87f08a7 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 5efb731..1237997 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 b9b0919..65f11f3 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 3c82ea2..580f604 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;
 		}
 	}