aboutsummaryrefslogtreecommitdiff
path: root/engines/teenagent
diff options
context:
space:
mode:
authorD G Turner2019-11-14 03:28:11 +0000
committerD G Turner2019-11-14 03:28:11 +0000
commite4a874c6b87ee556a92588253dcc16ee5a0a7ab3 (patch)
tree56411c60cbd40011ec56ecbc12f7ff53fcc851d4 /engines/teenagent
parenteaff2c539f68e67431853192038df9c8454d33dc (diff)
downloadscummvm-rg350-e4a874c6b87ee556a92588253dcc16ee5a0a7ab3.tar.gz
scummvm-rg350-e4a874c6b87ee556a92588253dcc16ee5a0a7ab3.tar.bz2
scummvm-rg350-e4a874c6b87ee556a92588253dcc16ee5a0a7ab3.zip
TEENAGENT: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/teenagent')
-rw-r--r--engines/teenagent/animation.cpp3
-rw-r--r--engines/teenagent/dialog.cpp9
-rw-r--r--engines/teenagent/resources.cpp4
-rw-r--r--engines/teenagent/teenagent.cpp1
4 files changed, 13 insertions, 4 deletions
diff --git a/engines/teenagent/animation.cpp b/engines/teenagent/animation.cpp
index 5708c101ec..6c3a09143b 100644
--- a/engines/teenagent/animation.cpp
+++ b/engines/teenagent/animation.cpp
@@ -199,6 +199,9 @@ void Animation::load(Common::SeekableReadStream &s, Type type) {
}
break;
+
+ default:
+ break;
}
debugC(2, kDebugAnimation, "%u frames", dataSize / 3);
diff --git a/engines/teenagent/dialog.cpp b/engines/teenagent/dialog.cpp
index 0993c26961..3c0f392033 100644
--- a/engines/teenagent/dialog.cpp
+++ b/engines/teenagent/dialog.cpp
@@ -115,17 +115,20 @@ void Dialog::show(Scene *scene, uint16 addr, uint16 animation1, uint16 animation
color = (color == color1) ? color2 : color1;
debugC(1, kDebugDialog, "changing color to %02x", color);
break;
+
+ default:
+ break;
}
break;
- case 0xff: {
+ case 0xff:
//FIXME : wait for the next cycle of the animation
- }
- break;
+ break;
default:
message += c;
n = 0;
+ break;
}
}
diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp
index b7e0d558f1..8388ee032e 100644
--- a/engines/teenagent/resources.cpp
+++ b/engines/teenagent/resources.cpp
@@ -176,7 +176,6 @@ Common::SeekableReadStream *Resources::loadLan(uint32 id) const {
Common::SeekableReadStream *Resources::loadLan000(uint32 id) const {
switch (id) {
-
case 81:
if (dseg.get_byte(dsAddr_dogHasBoneFlag))
return lan500.getStream(160);
@@ -222,6 +221,9 @@ Common::SeekableReadStream *Resources::loadLan000(uint32 id) const {
return lan500.getStream(400);
}
break;
+
+ default:
+ break;
}
return lan000.getStream(id);
}
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp
index 12f5123ad0..f70f244c43 100644
--- a/engines/teenagent/teenagent.cpp
+++ b/engines/teenagent/teenagent.cpp
@@ -167,6 +167,7 @@ void TeenAgentEngine::processObject() {
break;
case kActionNone:
+ default:
break;
}
}