WINTERMUTE: Fix Missing Default Switch Cases

These are flagged by GCC if -Wswitch-default is enabled.

38 files changed, 133 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) {
diff --git a/engines/wintermute/base/base.cpp b/engines/wintermute/base/base.cpp
index 90a3a62d69..28e8001772 100644
--- a/engines/wintermute/base/base.cpp
+++ b/engines/wintermute/base/base.cpp
@@ -136,6 +136,9 @@ bool BaseClass::parseEditorProperty(char *buffer, bool complete) {
 				cmd = PARSERR_GENERIC;
 			}
 			break;
+
+		default:
+			break;
 		}
 
 	}
diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index afcbd5b837..c32470720d 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -133,6 +133,7 @@ bool BaseFileManager::addPath(TPathType type, const Common::FSNode &path) {
 
 	switch (type) {
 	case PATH_SINGLE:
+	default:
 		//  _singlePaths.push_back(path);
 		error("TODO: Allow adding single-paths");
 		break;
diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp
index 910ab64a76..a821234ba0 100644
--- a/engines/wintermute/base/base_frame.cpp
+++ b/engines/wintermute/base/base_frame.cpp
@@ -292,6 +292,9 @@ bool BaseFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) {
 		case TOKEN_EDITOR_PROPERTY:
 			parseEditorProperty(params, false);
 			break;
+
+		default:
+			break;
 		}
 	}
 	if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 1f042c20ad..a06511f3ea 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -938,6 +938,9 @@ bool BaseGame::loadBuffer(char *buffer, bool complete) {
 		case TOKEN_COMPAT_KILL_METHOD_THREADS:
 			parser.scanStr(params, "%b", &_compatKillMethodThreads);
 			break;
+
+		default:
+			break;
 		}
 	}
 
diff --git a/engines/wintermute/base/base_game_settings.cpp b/engines/wintermute/base/base_game_settings.cpp
index 996bada997..43a9f3a149 100644
--- a/engines/wintermute/base/base_game_settings.cpp
+++ b/engines/wintermute/base/base_game_settings.cpp
@@ -187,6 +187,9 @@ bool BaseGameSettings::loadSettings(const char *filename) {
 
 			case TOKEN_GUID:
 				break;
+
+			default:
+				break;
 		}
 	}
 	if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/base/base_parser.cpp b/engines/wintermute/base/base_parser.cpp
index 2d80bc5017..61b57c42df 100644
--- a/engines/wintermute/base/base_parser.cpp
+++ b/engines/wintermute/base/base_parser.cpp
@@ -443,6 +443,8 @@ int32 BaseParser::scanStr(const char *in, const char *format, ...) {
 				*a = '\0';
 				break;
 			}
+			default:
+				break;
 			}
 			if (*format) {
 				format++;
diff --git a/engines/wintermute/base/base_region.cpp b/engines/wintermute/base/base_region.cpp
index 02ab365eff..cf32e04289 100644
--- a/engines/wintermute/base/base_region.cpp
+++ b/engines/wintermute/base/base_region.cpp
@@ -203,6 +203,9 @@ bool BaseRegion::loadBuffer(char *buffer, bool complete) {
 		case TOKEN_PROPERTY:
 			parseProperty(params, false);
 			break;
+
+		default:
+			break;
 		}
 	}
 	if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp
index fd9dd6a2a5..e1a28eb8ef 100644
--- a/engines/wintermute/base/base_script_holder.cpp
+++ b/engines/wintermute/base/base_script_holder.cpp
@@ -417,6 +417,9 @@ bool BaseScriptHolder::parseProperty(char *buffer, bool complete) {
 				cmd = PARSERR_GENERIC;
 			}
 			break;
+
+		default:
+			break;
 		}
 
 	}
diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp
index f282004a59..cde1225ead 100644
--- a/engines/wintermute/base/base_sprite.cpp
+++ b/engines/wintermute/base/base_sprite.cpp
@@ -328,6 +328,9 @@ bool BaseSprite::loadBuffer(char *buffer, bool complete, int lifeTime, TSpriteCa
 		case TOKEN_EDITOR_PROPERTY:
 			parseEditorProperty(params, false);
 			break;
+
+		default:
+			break;
 		}
 	}
 
diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp
index 8068e61168..e8e62fb6bc 100644
--- a/engines/wintermute/base/base_sub_frame.cpp
+++ b/engines/wintermute/base/base_sub_frame.cpp
@@ -180,6 +180,9 @@ bool BaseSubFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) {
 		case TOKEN_EDITOR_PROPERTY:
 			parseEditorProperty(params, false);
 			break;
+
+		default:
+			break;
 		}
 	}
 	if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/base/file/base_save_thumb_file.cpp b/engines/wintermute/base/file/base_save_thumb_file.cpp
index 54f7ee7c62..2d4a73f053 100644
--- a/engines/wintermute/base/file/base_save_thumb_file.cpp
+++ b/engines/wintermute/base/file/base_save_thumb_file.cpp
@@ -132,6 +132,7 @@ bool BaseSaveThumbFile::seek(uint32 pos, int whence) {
 
 	switch (whence) {
 	case SEEK_SET:
+	default:
 		newPos = pos;
 		break;
 	case SEEK_END:
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp
index bab2bf3df4..c33b48d085 100644
--- a/engines/wintermute/base/font/base_font_bitmap.cpp
+++ b/engines/wintermute/base/font/base_font_bitmap.cpp
@@ -419,6 +419,9 @@ bool BaseFontBitmap::loadBuffer(char *buffer) {
 		case TOKEN_EDITOR_PROPERTY:
 			parseEditorProperty(params, false);
 			break;
+
+		default:
+			break;
 		}
 
 	}
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index 03d82cb940..98eb4fac8f 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -442,6 +442,8 @@ bool BaseFontTT::loadBuffer(char *buffer) {
 		}
 		break;
 
+		default:
+			break;
 		}
 	}
 	if (cmd == PARSERR_TOKENNOTFOUND) {
@@ -500,6 +502,9 @@ bool BaseFontTT::parseLayer(BaseTTFontLayer *layer, char *buffer) {
 			layer->_color = BYTETORGBA(RGBCOLGetR(layer->_color), RGBCOLGetG(layer->_color), RGBCOLGetB(layer->_color), a);
 		}
 		break;
+
+		default:
+			break;
 		}
 	}
 	if (cmd != PARSERR_EOF) {
diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp
index 97c81e49a5..6c07ce3178 100644
--- a/engines/wintermute/base/particles/part_particle.cpp
+++ b/engines/wintermute/base/particles/part_particle.cpp
@@ -164,6 +164,9 @@ bool PartParticle::update(PartEmitter *emitter, uint32 currentTime, uint32 timer
 				_velocity += force->_direction * dist * elapsedTime;
 			}
 			break;
+
+			default:
+				break;
 			}
 		}
 		_pos += _velocity * elapsedTime;
diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp
index f95a21de33..a7575cb600 100644
--- a/engines/wintermute/base/sound/base_sound_manager.cpp
+++ b/engines/wintermute/base/sound/base_sound_manager.cpp
@@ -190,6 +190,9 @@ bool BaseSoundMgr::setVolume(Audio::Mixer::SoundType type, int volume) {
 		break;
 	case Audio::Mixer::kPlainSoundType:
 		error("Plain sound type shouldn't be used in WME");
+		break;
+	default:
+		break;
 	}
 	g_engine->syncSoundSettings();
 
diff --git a/engines/wintermute/debugger/error.cpp b/engines/wintermute/debugger/error.cpp
index dd6e41c7bc..ce8ca2bd24 100644
--- a/engines/wintermute/debugger/error.cpp
+++ b/engines/wintermute/debugger/error.cpp
@@ -79,6 +79,8 @@ Common::String Error::getErrorLevelStr() const {
 	case ERROR:
 		return "ERROR";
 		break;
+	default:
+		break;
 	}
 	return "SUCCESS";
 }
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index 12ecfe152d..2e41e1432e 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -456,6 +456,9 @@ bool UIButton::loadBuffer(char *buffer, bool complete) {
 		case TOKEN_EDITOR_PROPERTY:
 			parseEditorProperty(params, false);
 			break;
+
+		default:
+			break;
 		}
 	}
 	if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp
index 81030e09c3..0592464928 100644
--- a/engines/wintermute/ui/ui_edit.cpp
+++ b/engines/wintermute/ui/ui_edit.cpp
@@ -295,6 +295,9 @@ bool UIEdit::loadBuffer(char *buffer, bool complete) {
 		case TOKEN_EDITOR_PROPERTY:
 			parseEditorProperty(params, false);
 			break;
+
+		default:
+			break;
 		}
 	}
 	if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/ui/ui_entity.cpp b/engines/wintermute/ui/ui_entity.cpp
index 9e1e2a28e5..ce3d79c1b5 100644
--- a/engines/wintermute/ui/ui_entity.cpp
+++ b/engines/wintermute/ui/ui_entity.cpp
@@ -159,6 +159,9 @@ bool UIEntity::loadBuffer(char *buffer, bool complete) {
 		case TOKEN_EDITOR_PROPERTY:
 			parseEditorProperty(params, false);
 			break;
+
+		default:
+			break;
 		}
 	}
 	if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/ui/ui_text.cpp b/engines/wintermute/ui/ui_text.cpp
index 18b134a338..c0c9413564 100644
--- a/engines/wintermute/ui/ui_text.cpp
+++ b/engines/wintermute/ui/ui_text.cpp
@@ -298,6 +298,9 @@ bool UIText::loadBuffer(char *buffer, bool complete) {
 		case TOKEN_EDITOR_PROPERTY:
 			parseEditorProperty(params, false);
 			break;
+
+		default:
+			break;
 		}
 	}
 	if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/ui/ui_tiled_image.cpp b/engines/wintermute/ui/ui_tiled_image.cpp
index caa93df21c..21b1da88b5 100644
--- a/engines/wintermute/ui/ui_tiled_image.cpp
+++ b/engines/wintermute/ui/ui_tiled_image.cpp
@@ -254,6 +254,9 @@ bool UITiledImage::loadBuffer(char *buffer, bool complete) {
 		case TOKEN_EDITOR_PROPERTY:
 			parseEditorProperty(params, false);
 			break;
+
+		default:
+			break;
 		}
 	}
 	if (cmd == PARSERR_TOKENNOTFOUND) {
diff --git a/engines/wintermute/utils/convert_utf.cpp b/engines/wintermute/utils/convert_utf.cpp
index 8e02ec2df4..2e227e4064 100644
--- a/engines/wintermute/utils/convert_utf.cpp
+++ b/engines/wintermute/utils/convert_utf.cpp
@@ -292,6 +292,8 @@ ConversionResult ConvertUTF16toUTF8(
 		case 1:
 			*--target = (UTF8)(ch | firstByteMark[bytesToWrite]);
 			// fall through
+		default:
+			break;
 		}
 		target += bytesToWrite;
 	}
@@ -415,6 +417,9 @@ ConversionResult ConvertUTF8toUTF16(
 			// fall through
 		case 0:
 			ch += *source++;
+			break;
+		default:
+			break;
 		}
 		ch -= offsetsFromUTF8[extraBytesToRead];
 
@@ -523,6 +528,9 @@ ConversionResult ConvertUTF32toUTF8(
 			// fall through
 		case 1:
 			*--target = (UTF8)(ch | firstByteMark[bytesToWrite]);
+			break;
+		default:
+			break;
 		}
 		target += bytesToWrite;
 	}
@@ -577,6 +585,9 @@ ConversionResult ConvertUTF8toUTF32(
 			// fall through
 		case 0:
 			ch += *source++;
+			break;
+		default:
+			break;
 		}
 		ch -= offsetsFromUTF8[extraBytesToRead];
 
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 22c235c848..c1c42638f9 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -255,6 +255,9 @@ bool VideoTheoraPlayer::play(TVideoPlayback type, int x, int y, bool freezeGame,
 		_posX = (int)((_gameRef->_renderer->getWidth() - width) / 2);
 		_posY = (int)((_gameRef->_renderer->getHeight() - height) / 2);
 		break;
+
+	default:
+		break;
 	}
 	_theoraDecoder->start();