aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus/items/biochips
diff options
context:
space:
mode:
authorMatthew Hoops2012-05-12 20:27:48 -0400
committerMatthew Hoops2012-05-12 20:27:48 -0400
commitb2506abccf6aa64da31b497b45fe0e1949530053 (patch)
treefce0ae0324339b338f11f14248ecb02e8a21af15 /engines/pegasus/items/biochips
parent175befc3f127d547f94ff83a688f72c88996f2b9 (diff)
downloadscummvm-rg350-b2506abccf6aa64da31b497b45fe0e1949530053.tar.gz
scummvm-rg350-b2506abccf6aa64da31b497b45fe0e1949530053.tar.bz2
scummvm-rg350-b2506abccf6aa64da31b497b45fe0e1949530053.zip
PEGASUS: Fix some warnings found with optimizations on
Diffstat (limited to 'engines/pegasus/items/biochips')
-rw-r--r--engines/pegasus/items/biochips/opticalchip.cpp6
-rw-r--r--engines/pegasus/items/biochips/pegasuschip.cpp2
2 files changed, 5 insertions, 3 deletions
diff --git a/engines/pegasus/items/biochips/opticalchip.cpp b/engines/pegasus/items/biochips/opticalchip.cpp
index 6a9a41d573..0f60981955 100644
--- a/engines/pegasus/items/biochips/opticalchip.cpp
+++ b/engines/pegasus/items/biochips/opticalchip.cpp
@@ -138,9 +138,6 @@ void OpticalChip::playOpMemMovie(HotSpotID id) {
ItemState state = getItemState(), newState;
switch (state) {
- case kOptical000:
- // Can never happen.
- break;
case kOptical001:
newState = kOptical002;
break;
@@ -176,6 +173,9 @@ void OpticalChip::playOpMemMovie(HotSpotID id) {
else
newState = kOptical211;
break;
+ case kOptical000: // Can never happen.
+ default:
+ error("Invalid optical chip state");
}
setItemState(newState);
diff --git a/engines/pegasus/items/biochips/pegasuschip.cpp b/engines/pegasus/items/biochips/pegasuschip.cpp
index 320662af06..c0c3f6bb9e 100644
--- a/engines/pegasus/items/biochips/pegasuschip.cpp
+++ b/engines/pegasus/items/biochips/pegasuschip.cpp
@@ -153,6 +153,8 @@ void PegasusChip::clickInPegasusHotspot() {
case kPegasusWSC10:
hiliteState = kPegasusWSC11;
break;
+ default:
+ error("Invalid pegasus chip state");
}
// WORKAROUND: The original called setItemState() here. However,