From d7a22f72a1eed84441ffaf1204b5b46a6f41a58b Mon Sep 17 00:00:00 2001 From: D G Turner Date: Thu, 14 Nov 2019 23:28:07 +0000 Subject: WINTERMUTE: Fix Missing Default Switch Cases These are flagged by GCC if -Wswitch-default is enabled. --- engines/wintermute/base/base.cpp | 3 +++ engines/wintermute/base/base_file_manager.cpp | 1 + engines/wintermute/base/base_frame.cpp | 3 +++ engines/wintermute/base/base_game.cpp | 3 +++ engines/wintermute/base/base_game_settings.cpp | 3 +++ engines/wintermute/base/base_parser.cpp | 2 ++ engines/wintermute/base/base_region.cpp | 3 +++ engines/wintermute/base/base_script_holder.cpp | 3 +++ engines/wintermute/base/base_sprite.cpp | 3 +++ engines/wintermute/base/base_sub_frame.cpp | 3 +++ engines/wintermute/base/file/base_save_thumb_file.cpp | 1 + engines/wintermute/base/font/base_font_bitmap.cpp | 3 +++ engines/wintermute/base/font/base_font_truetype.cpp | 5 +++++ engines/wintermute/base/particles/part_particle.cpp | 3 +++ engines/wintermute/base/sound/base_sound_manager.cpp | 3 +++ 15 files changed, 42 insertions(+) (limited to 'engines/wintermute/base') 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(); -- cgit v1.2.3