aboutsummaryrefslogtreecommitdiff
path: root/engines/cge/cge_main.cpp
diff options
context:
space:
mode:
authorD G Turner2019-10-16 20:49:38 +0100
committerD G Turner2019-10-16 20:49:38 +0100
commitca800c3c6233ae0a43cf09eb8f4b57737dd0c934 (patch)
treedd2ad374f5619c3de1d07f0d54551e180d774168 /engines/cge/cge_main.cpp
parent7e31014e987dc80e375e6c71b64cd987a7790f82 (diff)
downloadscummvm-rg350-ca800c3c6233ae0a43cf09eb8f4b57737dd0c934.tar.gz
scummvm-rg350-ca800c3c6233ae0a43cf09eb8f4b57737dd0c934.tar.bz2
scummvm-rg350-ca800c3c6233ae0a43cf09eb8f4b57737dd0c934.zip
CGE: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/cge/cge_main.cpp')
-rw-r--r--engines/cge/cge_main.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index 05461e30e1..c944772e12 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -941,6 +941,8 @@ void CGEEngine::optionTouch(int opt, uint16 mask) {
if (mask & kMouseLeftUp)
quit();
break;
+ default:
+ break;
}
}
@@ -1065,22 +1067,23 @@ void CGEEngine::loadSprite(const char *fname, int ref, int scene, int col = 0, i
switch (i) {
- case 0 : // Name - will be taken in Expand routine
+ default:
+ case 0: // Name - will be taken in Expand routine
break;
- case 1 : // Type
+ case 1: // Type
if ((type = takeEnum(Type, strtok(NULL, " \t,;/"))) < 0)
error("Bad line %d [%s]", lcnt, fname);
break;
- case 2 : // Phase
+ case 2: // Phase
shpcnt++;
break;
- case 3 : // East
+ case 3: // East
east = (atoi(strtok(NULL, " \t,;/")) != 0);
break;
- case 11 : // Portable
+ case 11: // Portable
port = (atoi(strtok(NULL, " \t,;/")) != 0);
break;
- case 12 : // Transparent
+ case 12: // Transparent
tran = (atoi(strtok(NULL, " \t,;/")) != 0);
break;
}