[Scummvm-git-logs] scummvm master -> 522c5b654858ea4b1a7341060ecc8e259c7a5331

digitall 547637+digitall at users.noreply.github.com
Fri Oct 4 02:37:46 CEST 2019 

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:
522c5b6548 BLADERUNNER: Add Some Missing Switch Default Cases


Commit: 522c5b654858ea4b1a7341060ecc8e259c7a5331
    https://github.com/scummvm/scummvm/commit/522c5b654858ea4b1a7341060ecc8e259c7a5331
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-04T01:34:31+01:00

Commit Message:
BLADERUNNER: Add Some Missing Switch Default Cases

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

Changed paths:
    engines/bladerunner/actor.cpp
    engines/bladerunner/actor_combat.cpp
    engines/bladerunner/bladerunner.h
    engines/bladerunner/debugger.cpp
    engines/bladerunner/mouse.cpp
    engines/bladerunner/script/kia_script.cpp
    engines/bladerunner/script/vk_script.cpp


diff --git a/engines/bladerunner/actor.cpp b/engines/bladerunner/actor.cpp
index 7080b33..a74f6c4 100644
--- a/engines/bladerunner/actor.cpp
+++ b/engines/bladerunner/actor.cpp
@@ -302,6 +302,8 @@ void Actor::timerUpdate(int timerId) {
 			}
 			_timersLeft[kActorTimerRunningStaminaFPS] = 200u;
 			break;
+		default:
+			break;
 		}
 	}
 }
diff --git a/engines/bladerunner/actor_combat.cpp b/engines/bladerunner/actor_combat.cpp
index bc2e9a2..e1307f4 100644
--- a/engines/bladerunner/actor_combat.cpp
+++ b/engines/bladerunner/actor_combat.cpp
@@ -220,6 +220,8 @@ void ActorCombat::tick() {
 	case kActorCombatStateApproachRangedAttack:
 		approachToRangedAttack();
 		break;
+	default:
+		break;
 	}
 	--processingCounter;
 }
diff --git a/engines/bladerunner/bladerunner.h b/engines/bladerunner/bladerunner.h
index e02e4fb..8bd369b 100644
--- a/engines/bladerunner/bladerunner.h
+++ b/engines/bladerunner/bladerunner.h
@@ -357,6 +357,8 @@ static inline void drawPixel(Graphics::Surface &surface, void* dst, uint32 value
 		case 4:
 			*(uint32*)dst = (uint32)value;
 			break;
+		default:
+			break;
 	}
 }
 
diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp
index 4d2ffa0..d8ba06d 100644
--- a/engines/bladerunner/debugger.cpp
+++ b/engines/bladerunner/debugger.cpp
@@ -2206,6 +2206,8 @@ void Debugger::drawSceneObjects() {
 			int color;
 
 			switch (sceneObject->type) {
+			default:
+				// fallthrough intended
 			case kSceneObjectTypeUnknown:
 				break;
 			case kSceneObjectTypeActor:
diff --git a/engines/bladerunner/mouse.cpp b/engines/bladerunner/mouse.cpp
index 91c4d94..3d82fa0 100644
--- a/engines/bladerunner/mouse.cpp
+++ b/engines/bladerunner/mouse.cpp
@@ -159,6 +159,8 @@ void Mouse::setCursor(int cursor) {
 		_frame = 0;
 		_hotspotX = 11;
 		_hotspotY = 11;
+	default:
+		break;
 	}
 }
 
@@ -169,6 +171,8 @@ void Mouse::getXY(int *x, int *y) const {
 
 void Mouse::setMouseJitterUp() {
 	switch (_vm->_settings->getDifficulty()) {
+	default:
+		// fallthrough intended
 	case kGameDifficultyEasy:
 		_randomCountdownX = 2;
 		_randomX = _vm->_rnd.getRandomNumberRng(0, 6) - 3;
@@ -191,6 +195,8 @@ void Mouse::setMouseJitterUp() {
 
 void Mouse::setMouseJitterDown() {
 	switch (_vm->_settings->getDifficulty()) {
+	default:
+		// fallthrough intended
 	case kGameDifficultyEasy:
 		_randomCountdownY = 2;
 		_randomX = _vm->_rnd.getRandomNumberRng(0, 6) - 3;
@@ -327,6 +333,9 @@ void Mouse::updateCursorFrame() {
 	case 16:
 		if (++_frame > 2)
 			_frame = 0;
+		break;
+	default:
+		break;
 	}
 }
 
@@ -368,6 +377,8 @@ void Mouse::tick(int x, int y) {
 		case 3:
 			cursorId = 15;
 			break;
+		default:
+			break;
 		}
 		setCursor(cursorId);
 		return;
@@ -410,6 +421,8 @@ void Mouse::tick(int x, int y) {
 		case 2:
 			cursorId = 11;
 			break;
+		default:
+			break;
 		}
 
 		if (!_vm->_playerActor->isMoving() && animationMode != kAnimationModeCombatAim && animationMode != kAnimationModeCombatHit && animationMode != kAnimationModeCombatDie) {
@@ -426,6 +439,8 @@ void Mouse::tick(int x, int y) {
 		case 2:
 			cursorId = 10;
 			break;
+		default:
+			break;
 		}
 		if (!_vm->_playerActor->isMoving() && animationMode != kAnimationModeCombatIdle && animationMode != kAnimationModeCombatHit && animationMode != kAnimationModeCombatDie) {
 			_vm->_playerActor->changeAnimationMode(kAnimationModeCombatIdle, false);
diff --git a/engines/bladerunner/script/kia_script.cpp b/engines/bladerunner/script/kia_script.cpp
index 5cbdfe8..f40a677 100644
--- a/engines/bladerunner/script/kia_script.cpp
+++ b/engines/bladerunner/script/kia_script.cpp
@@ -986,6 +986,8 @@ void KIAScript::SCRIPT_KIA_DLL_Play_Clue_Asset_Script(int notUsed, int clueId) {
 		KIA_Play_Actor_Dialogue(kActorRunciter, 640);
 		KIA_Play_Actor_Dialogue(kActorRunciter, 650);
 		break;
+	default:
+		break;
 	}
 }
 
diff --git a/engines/bladerunner/script/vk_script.cpp b/engines/bladerunner/script/vk_script.cpp
index 6c4de42..71954c2 100644
--- a/engines/bladerunner/script/vk_script.cpp
+++ b/engines/bladerunner/script/vk_script.cpp
@@ -479,6 +479,8 @@ void VKScript::SCRIPT_VK_DLL_McCoy_Asks_Question(int actorId, int questionId) {
 			VK_Play_Speech_Line(kActorMcCoy, 7780, 0.5f);
 		}
 		break;
+	default:
+		break;
 	}
 
 	if ( _vm->_debugger->_playFullVk ) {
@@ -541,6 +543,8 @@ void VKScript::SCRIPT_VK_DLL_Question_Asked(int actorId, int questionId) {
 	case kActorDektora:
 		askDektora(questionId);
 		break;
+	default:
+		break;
 	}
 }
 
@@ -566,6 +570,8 @@ void VKScript::SCRIPT_VK_DLL_Shutdown(int actorId, int humanPercentage, int repl
 		case kActorDektora:
 			Actor_Clue_Acquire(kActorMcCoy, kClueVKDektoraReplicant, true, -1);
 			break;
+		default:
+			break;
 		}
 	} else if (humanPercentage > 79) {
 		VK_Play_Speech_Line(kActorAnsweringMachine, 420, 0.5f);
@@ -586,6 +592,8 @@ void VKScript::SCRIPT_VK_DLL_Shutdown(int actorId, int humanPercentage, int repl
 		case kActorDektora:
 			Actor_Clue_Acquire(kActorMcCoy, kClueVKDektoraHuman, true, -1);
 			break;
+		default:
+			break;
 		}
 	}
 	VK_Play_Speech_Line(kActorAnsweringMachine, 460, 0.5f);
@@ -1085,6 +1093,8 @@ void VKScript::askLucy(int questionId) {
 			VK_Play_Speech_Line(kActorMcCoy, 8538, 0.5f);
 		}
 		break;
+	default:
+		break;
 	}
 }
 
@@ -1360,6 +1370,8 @@ void VKScript::askGrigorian(int questionId) {
 		VK_Play_Speech_Line(kActorGrigorian, 1160, 0.5f);
 		VK_Subject_Reacts(5, -8, 7, 10);
 		break;
+	default:
+		break;
 	}
 }
 
@@ -1734,6 +1746,8 @@ void VKScript::askDektora(int questionId) {
 			VK_Subject_Reacts(99, 15, -4, 30);
 		}
 		break;
+	default:
+		break;
 	}
 }
 
@@ -2015,6 +2029,8 @@ void VKScript::askRunciter(int questionId) {
 			VK_Play_Speech_Line(kActorMcCoy, 8435, 0.5f);    // M: You're ready for the next one?
 			VK_Play_Speech_Line(kActorRunciter, 1590, 0.5f); // R: Let's get this over with
 			break;
+		default:
+			break;
 		}
 	} else {
 		switch (questionId) {
@@ -2192,6 +2208,8 @@ void VKScript::askRunciter(int questionId) {
 			VK_Subject_Reacts(20, 10, 20, 0);
 			VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f);
 			break;
+		default:
+			break;
 		}
 	}
 }
@@ -2541,6 +2559,8 @@ void VKScript::askBulletBob(int questionId) {
 		}
 		VK_Subject_Reacts(30, 7, 7, 10);
 		break;
+	default:
+		break;
 	}
 }
 
@@ -2561,6 +2581,8 @@ void VKScript::askCalibrationQuestion1(int actorId, int notUsed) {
 	case kActorDektora:
 		askDektora(7385);
 		break;
+	default:
+		break;
 	}
 }
 
@@ -2581,6 +2603,8 @@ void VKScript::askCalibrationQuestion2(int actorId, int notUsed) {
 	case kActorDektora:
 		askDektora(7390);
 		break;
+	default:
+		break;
 	}
 }
 
@@ -2601,6 +2625,8 @@ void VKScript::askCalibrationQuestion3(int actorId, int notUsed) {
 	case kActorDektora:
 		askDektora(7395);
 		break;
+	default:
+		break;
 	}
 }

More information about the Scummvm-git-logs mailing list