[Scummvm-git-logs] scummvm master -> b87ebdce2101a9943f727168526fe89725ebe759
digitall
547637+digitall at users.noreply.github.com
Mon Oct 7 08:44:35 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:
b87ebdce21 BLADERUNNER: Add Further Missing Default Switch Cases
Commit: b87ebdce2101a9943f727168526fe89725ebe759
https://github.com/scummvm/scummvm/commit/b87ebdce2101a9943f727168526fe89725ebe759
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-07T07:41:20+01:00
Commit Message:
BLADERUNNER: Add Further Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Changed paths:
engines/bladerunner/script/ai/bryant.cpp
engines/bladerunner/script/ai/bullet_bob.cpp
engines/bladerunner/script/ai/clovis.cpp
engines/bladerunner/script/ai/crazylegs.cpp
engines/bladerunner/script/ai/dektora.cpp
engines/bladerunner/script/police_maze.cpp
diff --git a/engines/bladerunner/script/ai/bryant.cpp b/engines/bladerunner/script/ai/bryant.cpp
index 2a76ee9..16736b3 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 ee5410a..243bad3 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 27da1d4..7731a8c 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 e54e57d..a63aff9 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 63fe72a..cb1f006 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;
}
diff --git a/engines/bladerunner/script/police_maze.cpp b/engines/bladerunner/script/police_maze.cpp
index 028eca0..5a0b1b5 100644
--- a/engines/bladerunner/script/police_maze.cpp
+++ b/engines/bladerunner/script/police_maze.cpp
@@ -525,6 +525,9 @@ bool PoliceMazeTargetTrack::tick() {
case 3:
_vm->_policeMaze->_tracks[trackId3]->resetPaused();
break;
+
+ default:
+ break;
}
break;
More information about the Scummvm-git-logs
mailing list