From 0386fd0eea6df3688cd4da988d7c1b3a377b1240 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Wed, 23 Oct 2019 23:42:38 +0100 Subject: HOPKINS: Fix Missing Default Switch Cases These are flagged by GCC if -Wswitch-default is enabled. --- engines/hopkins/computer.cpp | 12 +++++++++ engines/hopkins/dialogs.cpp | 12 +++++++++ engines/hopkins/events.cpp | 2 ++ engines/hopkins/files.cpp | 2 ++ engines/hopkins/font.cpp | 2 ++ engines/hopkins/globals.cpp | 2 ++ engines/hopkins/hopkins.cpp | 17 +++++++++++++ engines/hopkins/menu.cpp | 4 +++ engines/hopkins/objects.cpp | 27 +++++++++++++++++++++ engines/hopkins/script.cpp | 58 ++++++++++++++++++++++++++++++++++++++++++-- engines/hopkins/sound.cpp | 28 ++++++++++++++------- engines/hopkins/talk.cpp | 8 ++++++ 12 files changed, 163 insertions(+), 11 deletions(-) (limited to 'engines') diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp index aff3c914f6..7616b3573e 100644 --- a/engines/hopkins/computer.cpp +++ b/engines/hopkins/computer.cpp @@ -229,6 +229,8 @@ void ComputerManager::showComputer(ComputerEnum mode) { case '5': readText(4); break; + default: + break; } } else if (mode == COMPUTER_SAMANTHA) { clearScreen(); @@ -253,6 +255,8 @@ void ComputerManager::showComputer(ComputerEnum mode) { readText(10); _vm->_globals->_saveData->_data[svField270] = 4; break; + default: + break; } } } @@ -501,6 +505,8 @@ void ComputerManager::readText(int idx) { case LANG_SP: filename = "THOPKES.TXT"; break; + default: + break; } byte *ptr = _vm->_fileIO->loadFile(filename); @@ -713,6 +719,8 @@ void ComputerManager::displayBricks() { case 31: _vm->_graphicsMan->fastDisplay2(_breakoutSpr, cellLeft, cellTop, 23); break; + default: + break; } } @@ -1070,6 +1078,8 @@ int ComputerManager::moveBall() { _minBreakoutMoveSpeed = 3; _maxBreakoutMoveSpeed = 2; break; + default: + break; } int moveSpeed = _minBreakoutMoveSpeed; @@ -1242,6 +1252,8 @@ void ComputerManager::checkBallCollisions() { case 6: _breakoutScore += 40; break; + default: + break; } displayScore(); --_breakoutBrickNbr; diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp index cabdc9e9ea..2e7c397b5d 100644 --- a/engines/hopkins/dialogs.cpp +++ b/engines/hopkins/dialogs.cpp @@ -94,6 +94,8 @@ void DialogsManager::showOptionsDialog() { case LANG_SP: filename = "OPTIES.SPR"; break; + default: + break; } } @@ -256,6 +258,8 @@ void DialogsManager::showOptionsDialog() { case 320: _vm->_graphicsMan->_scrollSpeed = 1; break; + default: + break; } } @@ -319,6 +323,8 @@ void DialogsManager::showOptionsDialog() { case 640: _vm->_globals->_menuScrollSpeed = 23; break; + default: + break; } _vm->_events->refreshScreenAndEvents(); @@ -369,6 +375,8 @@ void DialogsManager::showInventory() { case LANG_SP: filename = "INVENTES.SPR"; break; + default: + break; } } @@ -670,6 +678,8 @@ void DialogsManager::showSaveLoad(SaveLoadMode mode) { case LANG_SP: filename = "SAVEES.SPR"; break; + default: + break; } } @@ -718,6 +728,8 @@ void DialogsManager::showSaveLoad(SaveLoadMode mode) { case 6: _vm->_graphicsMan->restoreSurfaceRect(_vm->_graphicsMan->_frontBuffer, thumb, startPosX_ + 323, 294, 128, 87); break; + default: + break; } thumb8.free(); diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp index 1ee495a111..58b8be18a6 100644 --- a/engines/hopkins/events.cpp +++ b/engines/hopkins/events.cpp @@ -97,6 +97,8 @@ void EventsManager::initMouseData() { case LANG_SP: _mouseCursor = _vm->_fileIO->loadFile("SOUES.SPR"); break; + default: + break; } } diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp index 3100ed6cdc..4e874597c2 100644 --- a/engines/hopkins/files.cpp +++ b/engines/hopkins/files.cpp @@ -182,6 +182,8 @@ byte *FileManager::searchCat(const Common::String &file, CatMode mode, bool &fil case LANG_SP: tmpFilename = "RES_VES.CAT"; break; + default: + break; } } diff --git a/engines/hopkins/font.cpp b/engines/hopkins/font.cpp index 9d11c5a940..ab95510175 100644 --- a/engines/hopkins/font.cpp +++ b/engines/hopkins/font.cpp @@ -55,6 +55,8 @@ void FontManager::loadZoneText() { case LANG_SP: _zoneText = _vm->_fileIO->loadFile("ZONEES.TXT"); break; + default: + break; } } diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp index d6f2c49a35..d659b050ef 100644 --- a/engines/hopkins/globals.cpp +++ b/engines/hopkins/globals.cpp @@ -166,6 +166,8 @@ void Globals::setConfig() { _zoneFilename = "ZONEES.TXT"; _textFilename = "TEXTEES.TXT"; break; + default: + break; } } diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp index 545af51ebc..7b16cd39ce 100644 --- a/engines/hopkins/hopkins.cpp +++ b/engines/hopkins/hopkins.cpp @@ -221,6 +221,8 @@ bool HopkinsEngine::runWin95Demo() { case LANG_SP: _graphicsMan->loadImage("fondes"); break; + default: + break; } } _graphicsMan->fadeInLong(); @@ -437,6 +439,9 @@ bool HopkinsEngine::runWin95Demo() { _globals->_eventMode = EVENTMODE_DEFAULT; _globals->_exitId = 300; break; + + default: + break; } } return true; @@ -537,6 +542,8 @@ bool HopkinsEngine::runLinuxDemo() { case LANG_SP: _graphicsMan->loadImage("fondes"); break; + default: + break; } } _graphicsMan->fadeInLong(); @@ -755,6 +762,9 @@ bool HopkinsEngine::runLinuxDemo() { _globals->_eventMode = EVENTMODE_DEFAULT; _globals->_exitId = 300; break; + + default: + break; } } return true; @@ -889,6 +899,8 @@ bool HopkinsEngine::runFull() { case LANG_SP: _graphicsMan->loadImage("fondes"); break; + default: + break; } } _graphicsMan->fadeInLong(); @@ -1564,6 +1576,9 @@ bool HopkinsEngine::runFull() { _globals->_eventMode = EVENTMODE_DEFAULT; _graphicsMan->_lineNbr = SCREEN_WIDTH; break; + + default: + break; } } _globals->_characterSpriteBuf = _globals->freeMemory(_globals->_characterSpriteBuf); @@ -2735,6 +2750,8 @@ void HopkinsEngine::handleOceanMouseEvents() { _globals->_oceanDirection = DIR_DOWN; _globals->_exitId = 4; break; + default: + break; } } diff --git a/engines/hopkins/menu.cpp b/engines/hopkins/menu.cpp index 165a403ffb..5ec9eb82c1 100644 --- a/engines/hopkins/menu.cpp +++ b/engines/hopkins/menu.cpp @@ -80,6 +80,8 @@ int MenuManager::menu() { case LANG_SP: _vm->_graphicsMan->loadImage("MENUES"); break; + default: + break; } } @@ -98,6 +100,8 @@ int MenuManager::menu() { case LANG_SP: spriteData = _vm->_objectsMan->loadSprite("MENUES.SPR"); break; + default: + break; } } diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index d67cd7b60c..95dd47a9e6 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -2280,6 +2280,8 @@ void ObjectsManager::changeCharacterHead(PlayerCharacter oldCharacter, PlayerCha _vm->_globals->_saveData->_data[svField357] = 0; _vm->_globals->_exitId = _vm->_globals->_saveData->_samantha._location; break; + default: + break; } } } @@ -2770,6 +2772,8 @@ void ObjectsManager::handleSpecialGames() { _vm->_globals->_saveData->_data[svField333] = 1; _vm->_globals->_disableInventFl = false; break; + default: + break; } } @@ -2863,6 +2867,8 @@ void ObjectsManager::doActionBack(int idx) { case 10: showSpecialActionAnimation(_gestureBuf, "23,22,21,20,19,18,17,16,15,-1,", 8); break; + default: + break; } } @@ -2904,6 +2910,8 @@ void ObjectsManager::doActionRight(int idx) { case 10: showSpecialActionAnimation(_gestureBuf, "28,27,26,25,24,23,-1,", 8); break; + default: + break; } } @@ -2945,6 +2953,8 @@ void ObjectsManager::doActionDiagRight(int idx) { case 10: showSpecialActionAnimation(_gestureBuf, "20,19,18,17,15,-1,", 8); break; + default: + break; } } @@ -2968,6 +2978,8 @@ void ObjectsManager::doActionFront(int idx) { case 4: showActionAnimation(_gestureBuf, "0,1,2,3,4,5,6,7,9,10,11,12,13,14,13,12,11,10,9,7,6,5,4,3,2,1,0,-1,", 8, false); break; + default: + break; } } @@ -3009,6 +3021,8 @@ void ObjectsManager::doActionDiagLeft(int idx) { case 10: showSpecialActionAnimation(_gestureBuf, "20,19,18,17,15,-1,", 8); break; + default: + break; } } @@ -3050,6 +3064,8 @@ void ObjectsManager::doActionLeft(int idx) { case 10: showSpecialActionAnimation(_gestureBuf, "28,27,26,25,24,23,-1,", 8); break; + default: + break; } } @@ -3375,6 +3391,9 @@ void ObjectsManager::sceneSpecialIni() { if (!_vm->_globals->_saveData->_data[svField333]) setBobAnimation(8); break; + + default: + break; } } @@ -3450,6 +3469,8 @@ void ObjectsManager::disableVerb(int idx, int a2) { case 15: curZone->_verbFl10 = 0; break; + default: + break; } _changeVerbFl = true; } @@ -3518,6 +3539,8 @@ void ObjectsManager::enableVerb(int idx, int a2) { case 25: curZone->_verbFl9 = 2; break; + default: + break; } } @@ -3692,6 +3715,8 @@ void ObjectsManager::handleForest(int screenId, int minX, int maxX, int minY, in else savegameIdx = 212; break; + default: + break; } if (_vm->_globals->_saveData->_data[savegameIdx] == 2) @@ -3884,6 +3909,8 @@ void ObjectsManager::sceneControl2(const Common::String &backgroundFile, const C case CHARACTER_SAMANTHA: addStaticSprite(_vm->_globals->_characterSpriteBuf, _characterPos, 0, _startSpriteIndex, 0, false, 20, 127); break; + default: + break; } _vm->_events->setMouseXY(_characterPos); if (_vm->_graphicsMan->_largeScreenFl) diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp index b0d8749c7f..96d5204c8e 100644 --- a/engines/hopkins/script.cpp +++ b/engines/hopkins/script.cpp @@ -159,6 +159,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case LANG_SP: _vm->_fontMan->initTextBuffers(9, mesgId, "OBJETES.TXT", 2 * textPosX, 60, 6, dataP[7], 253); break; + default: + break; } } @@ -458,6 +460,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { if (_vm->_globals->_actionDirection == DIR_LEFT) _vm->_objectsMan->doActionLeft(8); break; + default: + break; } } opcodeType = 1; @@ -797,6 +801,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 29: playFl = false; break; + default: + break; } switch (_vm->_objectsMan->getBobAnimDataIdx(10)) { @@ -822,6 +828,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { _vm->_graphicsMan->fastDisplay(_vm->_globals->_levelSpriteBuf, 513, 249, 3); playFl = false; break; + default: + break; } _vm->_events->refreshScreenAndEvents(); if (_vm->_objectsMan->getBobAnimDataIdx(9) == 36) @@ -870,6 +878,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 9: playFl = false; break; + default: + break; } switch (_vm->_objectsMan->getBobAnimDataIdx(10)) { @@ -882,6 +892,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 12: playFl = false; break; + default: + break; } _vm->_events->refreshScreenAndEvents(); if (_vm->_objectsMan->getBobAnimDataIdx(9) == endIdx) @@ -1024,6 +1036,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { _vm->_objectsMan->setBobAnimation(3); playFl = false; break; + default: + break; } _vm->_events->refreshScreenAndEvents(); if (_vm->_objectsMan->getBobAnimDataIdx(3) == 48) @@ -1069,6 +1083,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 5: playFl = false; break; + default: + break; } switch (_vm->_objectsMan->getBobAnimDataIdx(4)) { @@ -1081,6 +1097,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 6: playFl = false; break; + default: + break; } if (_vm->_objectsMan->getBobAnimDataIdx(13) == 8) { @@ -1140,6 +1158,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 5: playFl = false; break; + default: + break; } switch (_vm->_objectsMan->getBobAnimDataIdx(8)) { @@ -1152,6 +1172,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 12: playFl = false; break; + default: + break; } _vm->_events->refreshScreenAndEvents(); @@ -1251,6 +1273,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 8: playFl = false; break; + default: + break; } _vm->_events->refreshScreenAndEvents(); if (_vm->_objectsMan->getBobAnimDataIdx(1) == 9) @@ -1288,6 +1312,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 8: playFl = false; break; + default: + break; } _vm->_events->refreshScreenAndEvents(); if (_vm->_objectsMan->getBobAnimDataIdx(1) == 9) @@ -1469,6 +1495,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 56: playFl = false; break; + default: + break; } _vm->_events->refreshScreenAndEvents(); if (_vm->_objectsMan->getBobAnimDataIdx(4) == 72) @@ -1497,6 +1525,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 56: playFl = false; break; + default: + break; } _vm->_events->refreshScreenAndEvents(); if (_vm->_objectsMan->getBobAnimDataIdx(6) == 72) @@ -1525,6 +1555,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 56: playFl = false; break; + default: + break; } _vm->_events->refreshScreenAndEvents(); if (_vm->_objectsMan->getBobAnimDataIdx(5) == 72) @@ -1836,6 +1868,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 11: playFl = false; break; + default: + break; } _vm->_events->refreshScreenAndEvents(); if (_vm->_objectsMan->getBobAnimDataIdx(3) == 50) @@ -1865,6 +1899,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 11: playFl = false; break; + default: + break; } _vm->_events->refreshScreenAndEvents(); if (_vm->_objectsMan->getBobAnimDataIdx(4) == 24) @@ -2110,6 +2146,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 3: vbobFrameIndex = 4; break; + default: + break; } _vm->_soundMan->playSoundFile("SOUND83.WAV"); _vm->_objectsMan->setAndPlayAnim(vbobFrameIndex, 26, 50, false); @@ -2127,6 +2165,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { _vm->_graphicsMan->fastDisplay(_vm->_globals->_levelSpriteBuf, 296, 212, 4); _vm->_globals->_saveData->_data[svField340] = 0; break; + default: + break; } } _vm->_soundMan->playSoundFile("SOUND83.WAV"); @@ -2146,6 +2186,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 3: vbobFrameIndex = 4; break; + default: + break; } if (_vm->_globals->_saveData->_data[svField341]) { @@ -2165,6 +2207,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { _vm->_graphicsMan->fastDisplay(_vm->_globals->_levelSpriteBuf, 296, 212, 4); _vm->_globals->_saveData->_data[svField340] = 0; break; + default: + break; } } @@ -2185,6 +2229,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { case 3: vbobFrameIndex = 4; break; + default: + break; } if (_vm->_globals->_saveData->_data[svField341]) { @@ -2203,6 +2249,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { _vm->_graphicsMan->fastDisplay(_vm->_globals->_levelSpriteBuf, 296, 212, 4); _vm->_globals->_saveData->_data[svField340] = 0; break; + default: + break; } } _vm->_soundMan->playSoundFile("SOUND83.WAV"); @@ -2244,6 +2292,8 @@ int ScriptManager::handleOpcode(const byte *dataP) { soundFlag = true; } break; + default: + break; } } while (_vm->_objectsMan->getBobAnimDataIdx(1) != 32); _vm->_objectsMan->stopBobAnimation(1); @@ -2447,6 +2497,9 @@ int ScriptManager::handleOpcode(const byte *dataP) { _vm->_objectsMan->setBobAnimation(12); _vm->_objectsMan->setBobAnimation(13); break; + + default: + break; } opcodeType = 1; break; @@ -2625,8 +2678,9 @@ int ScriptManager::checkOpcode(const byte *dataP) { case MKTAG24('J', 'U', 'M'): result = 6; break; -// default: -// warning("Unhandled opcode %c%c%c", dataP[2], dataP[3], dataP[4]); + default: + warning("Unhandled opcode %c%c%c", dataP[2], dataP[3], dataP[4]); + break; } return result; } diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp index 3030636a59..a3317fca43 100644 --- a/engines/hopkins/sound.cpp +++ b/engines/hopkins/sound.cpp @@ -260,6 +260,8 @@ void SoundManager::loadAnimSound() { loadWav("SOUND80.WAV", 1); loadWav("SOUND82.WAV", 2); break; + default: + break; } } @@ -298,6 +300,8 @@ void SoundManager::playAnimSound(int animFrame) { if (_vm->getLanguage() != Common::PL_POL) playSample(4); break; + default: + break; } } else if (_specialSoundNum == 1 && animFrame == 17) playSoundFile("SOUND42.WAV"); @@ -526,10 +530,10 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) { bool fileFoundFl = false; _vm->_fileIO->searchCat(filename + ".WAV", RES_VOI, fileFoundFl); if (fileFoundFl) { - if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) + if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) { filename = "ENG_VOI.RES"; - // Win95 and Linux versions uses another set of names - else { + } else { + // Win95 and Linux versions uses another set of names switch (_vm->_globals->_language) { case LANG_FR: filename = "RES_VFR.RES"; @@ -540,6 +544,8 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) { case LANG_SP: filename = "RES_VES.RES"; break; + default: + break; } } @@ -548,10 +554,10 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) { } else { _vm->_fileIO->searchCat(filename + ".APC", RES_VOI, fileFoundFl); if (fileFoundFl) { - if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) + if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) { filename = "ENG_VOI.RES"; - // Win95 and Linux versions uses another set of names - else { + } else { + // Win95 and Linux versions uses another set of names switch (_vm->_globals->_language) { case LANG_FR: filename = "RES_VFR.RES"; @@ -562,6 +568,8 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) { case LANG_SP: filename = "RES_VES.RES"; break; + default: + break; } } @@ -570,10 +578,10 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) { } else { _vm->_fileIO->searchCat(filename + ".RAW", RES_VOI, fileFoundFl); if (fileFoundFl) { - if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) + if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) { filename = "ENG_VOI.RES"; - // Win95 and Linux versions uses another set of names - else { + } else { + // Win95 and Linux versions uses another set of names switch (_vm->_globals->_language) { case LANG_FR: filename = "RES_VFR.RES"; @@ -584,6 +592,8 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) { case LANG_SP: filename = "RES_VES.RES"; break; + default: + break; } } diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp index f3cd6bd026..1ed7aaf66c 100644 --- a/engines/hopkins/talk.cpp +++ b/engines/hopkins/talk.cpp @@ -79,6 +79,8 @@ void TalkManager::startAnimatedCharacterDialogue(const Common::String &filename) case LANG_SP: _answersFilename = _questionsFilename = "RUEES.TXT"; break; + default: + break; } _dialogueMesgId1 = READ_LE_INT16((uint16 *)_characterBuffer + 40); _paletteBufferIdx = 20 * READ_LE_INT16((uint16 *)_characterBuffer + 42) + 110; @@ -182,6 +184,8 @@ void TalkManager::startStaticCharacterDialogue(const Common::String &filename) { _questionsFilename = "RUEES.TXT"; _answersFilename = "RUEES.TXT"; break; + default: + break; } _dialogueMesgId1 = READ_LE_INT16((uint16 *)_characterBuffer + 40); @@ -907,6 +911,8 @@ void TalkManager::handleForestAnswser(int zone, int verb) { case 41: indx = 213; break; + default: + break; } _vm->_globals->_saveData->_data[indx] = 2; _vm->_linesMan->disableZone(22); @@ -954,6 +960,8 @@ void TalkManager::handleForestAnswser(int zone, int verb) { case 41: indx = 212; break; + default: + break; } _vm->_globals->_saveData->_data[indx] = 2; _vm->_linesMan->disableZone(21); -- cgit v1.2.3