aboutsummaryrefslogtreecommitdiff
path: root/engines/cryomni3d
diff options
context:
space:
mode:
authorLe Philousophe2019-10-19 20:29:56 +0200
committerLe Philousophe2019-10-19 20:29:56 +0200
commit49476a1bc3cf4f9e7aceac2c21fb30dcfcacfa3a (patch)
tree3f81d63c60bf5719925023818cf7987775142c1c /engines/cryomni3d
parentb0ed255b391b23ad0126e030f52a53783f4004c0 (diff)
downloadscummvm-rg350-49476a1bc3cf4f9e7aceac2c21fb30dcfcacfa3a.tar.gz
scummvm-rg350-49476a1bc3cf4f9e7aceac2c21fb30dcfcacfa3a.tar.bz2
scummvm-rg350-49476a1bc3cf4f9e7aceac2c21fb30dcfcacfa3a.zip
CRYOMNI3D: Fix default cases to raise errors
Diffstat (limited to 'engines/cryomni3d')
-rw-r--r--engines/cryomni3d/versailles/logic.cpp6
-rw-r--r--engines/cryomni3d/video/hnm_decoder.cpp4
2 files changed, 8 insertions, 2 deletions
diff --git a/engines/cryomni3d/versailles/logic.cpp b/engines/cryomni3d/versailles/logic.cpp
index 248226c7a8..10e96d1413 100644
--- a/engines/cryomni3d/versailles/logic.cpp
+++ b/engines/cryomni3d/versailles/logic.cpp
@@ -2683,7 +2683,6 @@ IMG_CB(88003) {
FixedImgCallback callback = nullptr;
switch (_gameVariables[GameVariables::kBombState]) {
case 1:
- default:
callback = &CryOmni3DEngine_Versailles::img_88003b;
break;
case 2:
@@ -2698,6 +2697,9 @@ IMG_CB(88003) {
case 5:
callback = &CryOmni3DEngine_Versailles::img_88003f;
break;
+ default:
+ error("BUG: Invalid bomb state");
+ break;
}
ZonFixedImage::CallbackFunctor *functor =
new Common::Functor1Mem<ZonFixedImage *, void, CryOmni3DEngine_Versailles>(this, callback);
@@ -4310,6 +4312,7 @@ void CryOmni3DEngine_Versailles::filterEventLevel5UpdatePlaceStates() {
setPlaceState(16, 5);
break;
default:
+ error("BUG: Invalid ladder state");
break;
}
} else {
@@ -4328,6 +4331,7 @@ void CryOmni3DEngine_Versailles::filterEventLevel5UpdatePlaceStates() {
setPlaceState(16, 6);
break;
default:
+ error("BUG: Invalid ladder state");
break;
}
}
diff --git a/engines/cryomni3d/video/hnm_decoder.cpp b/engines/cryomni3d/video/hnm_decoder.cpp
index bd548e4294..e139f99716 100644
--- a/engines/cryomni3d/video/hnm_decoder.cpp
+++ b/engines/cryomni3d/video/hnm_decoder.cpp
@@ -286,10 +286,12 @@ void HNMDecoder::HNM4VideoTrack::decodeInterframe(Common::SeekableReadStream *st
currentPos += width;
break;
case 3:
- default:
// End of picture
eop = true;
break;
+ default:
+ error("BUG: Shouldn't be here");
+ break;
}
} else {
if (size < 2) {