aboutsummaryrefslogtreecommitdiff
path: root/engines/cge2
diff options
context:
space:
mode:
authorD G Turner2019-10-16 22:53:54 +0100
committerD G Turner2019-10-16 22:53:54 +0100
commit32a6f0b376dd98abd59ae8e9c61bce50f58ffa1a (patch)
treea5a7c5a3584a6ff58fe7c4a89e2c1f8db8ae1ab8 /engines/cge2
parentca800c3c6233ae0a43cf09eb8f4b57737dd0c934 (diff)
downloadscummvm-rg350-32a6f0b376dd98abd59ae8e9c61bce50f58ffa1a.tar.gz
scummvm-rg350-32a6f0b376dd98abd59ae8e9c61bce50f58ffa1a.tar.bz2
scummvm-rg350-32a6f0b376dd98abd59ae8e9c61bce50f58ffa1a.zip
CGE2: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/cge2')
-rw-r--r--engines/cge2/bitmap.cpp4
-rw-r--r--engines/cge2/hero.cpp2
-rw-r--r--engines/cge2/vga13h.cpp3
3 files changed, 9 insertions, 0 deletions
diff --git a/engines/cge2/bitmap.cpp b/engines/cge2/bitmap.cpp
index 590d9f0e57..14239924aa 100644
--- a/engines/cge2/bitmap.cpp
+++ b/engines/cge2/bitmap.cpp
@@ -308,6 +308,9 @@ bool Bitmap::solidAt(V2D pos) {
case kBmpREP:
w = 1;
break;
+ case kBmpCPY:
+ default:
+ break;
}
m += w;
}
@@ -325,6 +328,7 @@ bool Bitmap::solidAt(V2D pos) {
n += w;
switch (t) {
+ default:
case kBmpEOI:
return false;
case kBmpSKP:
diff --git a/engines/cge2/hero.cpp b/engines/cge2/hero.cpp
index 42ae67cc2b..6dbfc5e6b4 100644
--- a/engines/cge2/hero.cpp
+++ b/engines/cge2/hero.cpp
@@ -155,6 +155,8 @@ Sprite *Hero::expand() {
case 0xFE:
s->_next = seqcnt - 1;
break;
+ default:
+ break;
}
if (s->_next > maxnxt)
maxnxt = s->_next;
diff --git a/engines/cge2/vga13h.cpp b/engines/cge2/vga13h.cpp
index 8b8acb6ade..fab61b31f4 100644
--- a/engines/cge2/vga13h.cpp
+++ b/engines/cge2/vga13h.cpp
@@ -406,6 +406,8 @@ Sprite *Sprite::expand() {
case 0xFE:
s->_next = seqcnt - 1;
break;
+ default:
+ break;
}
if (s->_next > maxnxt)
maxnxt = s->_next;
@@ -1149,6 +1151,7 @@ void Bitmap::show(V2D pos) {
while (count-- > 0) {
// Transfer operation
switch (cmd) {
+ default:
case 1:
// SKIP
break;