aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/ad
diff options
context:
space:
mode:
authorD G Turner2019-11-14 23:28:07 +0000
committerD G Turner2019-11-14 23:28:07 +0000
commitd7a22f72a1eed84441ffaf1204b5b46a6f41a58b (patch)
tree958e00a757f26de21cbacd4e0cb98bcb750c0e0d /engines/wintermute/ad
parentc7a5b152184af66d50c533319f2a3795ba7a46a7 (diff)
downloadscummvm-rg350-d7a22f72a1eed84441ffaf1204b5b46a6f41a58b.tar.gz
scummvm-rg350-d7a22f72a1eed84441ffaf1204b5b46a6f41a58b.tar.bz2
scummvm-rg350-d7a22f72a1eed84441ffaf1204b5b46a6f41a58b.zip
WINTERMUTE: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/wintermute/ad')
-rw-r--r--engines/wintermute/ad/ad_actor.cpp6
-rw-r--r--engines/wintermute/ad/ad_entity.cpp3
-rw-r--r--engines/wintermute/ad/ad_game.cpp12
-rw-r--r--engines/wintermute/ad/ad_inventory_box.cpp3
-rw-r--r--engines/wintermute/ad/ad_item.cpp3
-rw-r--r--engines/wintermute/ad/ad_layer.cpp3
-rw-r--r--engines/wintermute/ad/ad_region.cpp3
-rw-r--r--engines/wintermute/ad/ad_response_box.cpp5
-rw-r--r--engines/wintermute/ad/ad_rot_level.cpp3
-rw-r--r--engines/wintermute/ad/ad_scale_level.cpp3
-rw-r--r--engines/wintermute/ad/ad_scene.cpp2
-rw-r--r--engines/wintermute/ad/ad_sprite_set.cpp5
-rw-r--r--engines/wintermute/ad/ad_talk_def.cpp3
-rw-r--r--engines/wintermute/ad/ad_talk_node.cpp3
-rw-r--r--engines/wintermute/ad/ad_waypoint_group.cpp3
15 files changed, 60 insertions, 0 deletions
diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index fdef2e170d..75e7c45d7e 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -456,6 +456,9 @@ bool AdActor::loadBuffer(char *buffer, bool complete) {
}
}
break;
+
+ default:
+ break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
@@ -1435,6 +1438,9 @@ bool AdActor::mergeAnims(const char *animsFilename) {
}
}
break;
+
+ default:
+ break;
}
}
delete[] fileBuffer;
diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index 0909d7ef91..7a4df6c114 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -489,6 +489,9 @@ bool AdEntity::loadBuffer(char *buffer, bool complete) {
_walkToDir = (TDirection)i;
}
break;
+
+ default:
+ break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index 110dfa9678..dff0216c10 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -1381,9 +1381,15 @@ bool AdGame::loadBuffer(char *buffer, bool complete) {
case TOKEN_DEBUG_STARTUP_SCENE:
BaseUtils::setString(&_debugStartupScene, params2);
break;
+
+ default:
+ break;
}
}
break;
+
+ default:
+ break;
}
}
@@ -1577,6 +1583,9 @@ bool AdGame::loadItemsBuffer(char *buffer, bool merge) {
}
}
break;
+
+ default:
+ break;
}
}
@@ -1648,6 +1657,9 @@ bool AdGame::windowLoadHook(UIWindow *win, char **buffer, char **params) {
}
}
break;
+
+ default:
+ break;
}
if (cmd == PARSERR_TOKENNOTFOUND || cmd == PARSERR_GENERIC) {
diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index a2e54a3318..ef62788c65 100644
--- a/engines/wintermute/ad/ad_inventory_box.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -298,6 +298,9 @@ bool AdInventoryBox::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
+
+ default:
+ break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/ad/ad_item.cpp b/engines/wintermute/ad/ad_item.cpp
index c7eda029cf..b414fbdadf 100644
--- a/engines/wintermute/ad/ad_item.cpp
+++ b/engines/wintermute/ad/ad_item.cpp
@@ -310,6 +310,9 @@ bool AdItem::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
+
+ default:
+ break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/ad/ad_layer.cpp b/engines/wintermute/ad/ad_layer.cpp
index f6ea339895..d5826eb1a2 100644
--- a/engines/wintermute/ad/ad_layer.cpp
+++ b/engines/wintermute/ad/ad_layer.cpp
@@ -217,6 +217,9 @@ bool AdLayer::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
+
+ default:
+ break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/ad/ad_region.cpp b/engines/wintermute/ad/ad_region.cpp
index 89ad09fb8f..9d61f09548 100644
--- a/engines/wintermute/ad/ad_region.cpp
+++ b/engines/wintermute/ad/ad_region.cpp
@@ -220,6 +220,9 @@ bool AdRegion::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
+
+ default:
+ break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index 83c2ae74c6..fc8e778f37 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -367,6 +367,9 @@ bool AdResponseBox::loadBuffer(char *buffer, bool complete) {
cmd = PARSERR_GENERIC;
}
break;
+
+ default:
+ break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
@@ -422,6 +425,7 @@ bool AdResponseBox::saveAsText(BaseDynamicBuffer *buffer, int indent) {
switch (_verticalAlign) {
case VAL_TOP:
+ default:
buffer->putTextIndent(indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "top");
break;
case VAL_BOTTOM:
@@ -487,6 +491,7 @@ bool AdResponseBox::display() {
break;
case VAL_TOP:
+ default:
// do nothing
break;
}
diff --git a/engines/wintermute/ad/ad_rot_level.cpp b/engines/wintermute/ad/ad_rot_level.cpp
index 410ba22b53..e2aae8b8ee 100644
--- a/engines/wintermute/ad/ad_rot_level.cpp
+++ b/engines/wintermute/ad/ad_rot_level.cpp
@@ -125,6 +125,9 @@ bool AdRotLevel::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
+
+ default:
+ break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/ad/ad_scale_level.cpp b/engines/wintermute/ad/ad_scale_level.cpp
index 7e2eaa6f4f..d64d2904bc 100644
--- a/engines/wintermute/ad/ad_scale_level.cpp
+++ b/engines/wintermute/ad/ad_scale_level.cpp
@@ -126,6 +126,9 @@ bool AdScaleLevel::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
+
+ default:
+ break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index b57faef69b..ca901f6dcc 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -878,6 +878,8 @@ bool AdScene::loadBuffer(char *buffer, bool complete) {
parseEditorProperty(params, false);
break;
+ default:
+ break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/ad/ad_sprite_set.cpp b/engines/wintermute/ad/ad_sprite_set.cpp
index e598913ae6..ef1449a242 100644
--- a/engines/wintermute/ad/ad_sprite_set.cpp
+++ b/engines/wintermute/ad/ad_sprite_set.cpp
@@ -225,6 +225,9 @@ bool AdSpriteSet::loadBuffer(char *buffer, bool complete, int lifeTime, TSpriteC
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
+
+ default:
+ break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
@@ -328,6 +331,8 @@ bool AdSpriteSet::saveAsText(BaseDynamicBuffer *buffer, int indent) {
case DI_UPLEFT:
buffer->putTextIndent(indent + 2, "UP_LEFT=\"%s\"\n", _sprites[i]->getFilename());
break;
+ default:
+ break;
}
}
}
diff --git a/engines/wintermute/ad/ad_talk_def.cpp b/engines/wintermute/ad/ad_talk_def.cpp
index 6194121727..9765010151 100644
--- a/engines/wintermute/ad/ad_talk_def.cpp
+++ b/engines/wintermute/ad/ad_talk_def.cpp
@@ -167,6 +167,9 @@ bool AdTalkDef::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
+
+ default:
+ break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/ad/ad_talk_node.cpp b/engines/wintermute/ad/ad_talk_node.cpp
index f4612122da..f048402e99 100644
--- a/engines/wintermute/ad/ad_talk_node.cpp
+++ b/engines/wintermute/ad/ad_talk_node.cpp
@@ -150,6 +150,9 @@ bool AdTalkNode::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
+
+ default:
+ break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/ad/ad_waypoint_group.cpp b/engines/wintermute/ad/ad_waypoint_group.cpp
index 25d7f83264..39515e8252 100644
--- a/engines/wintermute/ad/ad_waypoint_group.cpp
+++ b/engines/wintermute/ad/ad_waypoint_group.cpp
@@ -156,6 +156,9 @@ bool AdWaypointGroup::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
+
+ default:
+ break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {