From b87ebdce2101a9943f727168526fe89725ebe759 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Mon, 7 Oct 2019 07:41:20 +0100 Subject: BLADERUNNER: Add Further Missing Default Switch Cases These are flagged by GCC if -Wswitch-default is enabled. --- engines/bladerunner/script/ai/bryant.cpp | 9 +++++++++ engines/bladerunner/script/ai/bullet_bob.cpp | 3 +++ engines/bladerunner/script/ai/clovis.cpp | 5 +++++ engines/bladerunner/script/ai/crazylegs.cpp | 4 ++++ engines/bladerunner/script/ai/dektora.cpp | 20 ++++++++++++++++++++ 5 files changed, 41 insertions(+) (limited to 'engines/bladerunner/script/ai') diff --git a/engines/bladerunner/script/ai/bryant.cpp b/engines/bladerunner/script/ai/bryant.cpp index 2a76ee9655..16736b3732 100644 --- a/engines/bladerunner/script/ai/bryant.cpp +++ b/engines/bladerunner/script/ai/bryant.cpp @@ -202,12 +202,17 @@ bool AIScriptBryant::GoalChanged(int currentGoalNumber, int newGoalNumber) { AI_Movement_Track_Append(kActorBryant, 331, 0); AI_Movement_Track_Repeat(kActorBryant); break; + default: + break; } // fallthrough case 102: AI_Movement_Track_Append(kActorBryant, 39, 0); AI_Movement_Track_Repeat(kActorBryant); break; + + default: + break; } return false; @@ -243,6 +248,8 @@ bool AIScriptBryant::UpdateAnimation(int *animation, int *frame) { *animation = 808; _animationFrame = Slice_Animation_Query_Number_Of_Frames(808) - 1; break; + default: + break; } *frame = _animationFrame; @@ -264,6 +271,8 @@ bool AIScriptBryant::ChangeAnimationMode(int mode) { _animationFrame = 0; Actor_Set_Goal_Number(kActorBryant, 0); break; + default: + break; } return true; } diff --git a/engines/bladerunner/script/ai/bullet_bob.cpp b/engines/bladerunner/script/ai/bullet_bob.cpp index ee5410a263..243bad3637 100644 --- a/engines/bladerunner/script/ai/bullet_bob.cpp +++ b/engines/bladerunner/script/ai/bullet_bob.cpp @@ -425,6 +425,9 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) { *animation = 510; _animationFrame = Slice_Animation_Query_Number_Of_Frames(510) - 1; break; + + default: + break; } *frame = _animationFrame; diff --git a/engines/bladerunner/script/ai/clovis.cpp b/engines/bladerunner/script/ai/clovis.cpp index 27da1d4896..7731a8cd18 100644 --- a/engines/bladerunner/script/ai/clovis.cpp +++ b/engines/bladerunner/script/ai/clovis.cpp @@ -241,6 +241,8 @@ int AIScriptClovis::GetFriendlinessModifierIfGetsClue(int otherActorId, int clue case kClueMcCoyRetiredLutherLance: case kClueMcCoyIsInsane: return -5; + default: + break; } return 0; } @@ -1500,6 +1502,9 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) { _animationFrame = 0; _animationState = 32; break; + + default: + break; } return true; diff --git a/engines/bladerunner/script/ai/crazylegs.cpp b/engines/bladerunner/script/ai/crazylegs.cpp index e54e57dd36..a63aff93a2 100644 --- a/engines/bladerunner/script/ai/crazylegs.cpp +++ b/engines/bladerunner/script/ai/crazylegs.cpp @@ -375,6 +375,8 @@ bool AIScriptCrazylegs::ChangeAnimationMode(int mode) { case 15: _flag = true; break; + default: + break; } break; case 1: @@ -440,6 +442,8 @@ bool AIScriptCrazylegs::ChangeAnimationMode(int mode) { _animationFrame = Slice_Animation_Query_Number_Of_Frames(469) - 1; } break; + default: + break; } return true; diff --git a/engines/bladerunner/script/ai/dektora.cpp b/engines/bladerunner/script/ai/dektora.cpp index 63fe72a1bb..cb1f006343 100644 --- a/engines/bladerunner/script/ai/dektora.cpp +++ b/engines/bladerunner/script/ai/dektora.cpp @@ -109,6 +109,9 @@ bool AIScriptDektora::Update() { case 275: Actor_Set_Goal_Number(kActorDektora, 276); break; + + default: + break; } } return true; @@ -1010,6 +1013,9 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) { case 2: Sound_Play(kSfxWHISTLE3, (100 / Random_Query(5, 9)), 0, 0, 50); break; + + default: + break; } } @@ -1037,6 +1043,9 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) { case 2: Sound_Play(kSfxWHISTLE3, (100 / Random_Query(5, 9)), 0, 0, 50); break; + + default: + break; } } @@ -1063,6 +1072,9 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) { case 2: Sound_Play(kSfxWHISTLE3, (100 / Random_Query(5, 9)), 0, 0, 50); break; + + default: + break; } } @@ -1088,6 +1100,9 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) { case 2: Sound_Play(kSfxWHISTLE3, (100 / Random_Query(5, 9)), 0, 0, 50); break; + + default: + break; } } @@ -1341,6 +1356,8 @@ bool AIScriptDektora::ChangeAnimationMode(int mode) { _animationState = 19; } break; + default: + break; } _animationFrame = 0; break; @@ -1423,6 +1440,9 @@ bool AIScriptDektora::ChangeAnimationMode(int mode) { _animationState = 37; _animationFrame = 0; break; + + default: + break; } return true; } -- cgit v1.2.3