aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/engine
diff options
context:
space:
mode:
authorD G Turner2019-12-06 04:31:04 +0000
committerD G Turner2019-12-06 04:31:04 +0000
commitd77e70a90238424028cce6da27646d40429b8a00 (patch)
treeec3e64ef92ad756eed7eaa581cd7bfa38cd259a4 /engines/kyra/engine
parente75722665d1f3687a71927670e4e2a4491597a53 (diff)
downloadscummvm-rg350-d77e70a90238424028cce6da27646d40429b8a00.tar.gz
scummvm-rg350-d77e70a90238424028cce6da27646d40429b8a00.tar.bz2
scummvm-rg350-d77e70a90238424028cce6da27646d40429b8a00.zip
KYRA: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/kyra/engine')
-rw-r--r--engines/kyra/engine/kyra_v1.cpp6
-rw-r--r--engines/kyra/engine/scene_mr.cpp3
2 files changed, 9 insertions, 0 deletions
diff --git a/engines/kyra/engine/kyra_v1.cpp b/engines/kyra/engine/kyra_v1.cpp
index 7b93851d8f..4f8296c610 100644
--- a/engines/kyra/engine/kyra_v1.cpp
+++ b/engines/kyra/engine/kyra_v1.cpp
@@ -655,6 +655,9 @@ void KyraEngine_v1::setVolume(kVolumeEntry vol, uint8 value) {
case kVolumeSpeech:
ConfMan.setInt("speech_volume", convertVolumeToMixer(value));
break;
+
+ default:
+ break;
}
// Resetup mixer
@@ -679,6 +682,9 @@ uint8 KyraEngine_v1::getVolume(kVolumeEntry vol) {
else
return 2;
break;
+
+ default:
+ break;
}
return 2;
diff --git a/engines/kyra/engine/scene_mr.cpp b/engines/kyra/engine/scene_mr.cpp
index ea0e69ecea..97920e380c 100644
--- a/engines/kyra/engine/scene_mr.cpp
+++ b/engines/kyra/engine/scene_mr.cpp
@@ -62,6 +62,9 @@ void KyraEngine_MR::enterNewScene(uint16 sceneId, int facing, int unk1, int unk2
case 6:
x = -24;
break;
+
+ default:
+ break;
}
moveCharacter(facing, x, y);