diff options
author | D G Turner | 2019-11-15 02:51:50 +0000 |
---|---|---|
committer | D G Turner | 2019-11-15 02:51:50 +0000 |
commit | 4af25ccfddec83d0525ad43c309fe8d3b751ea7b (patch) | |
tree | b1e4c6de4382e18c137d9d349109f50ee77a9019 | |
parent | f113a00141940477db0bd9aeffc554fd8a72c57e (diff) | |
download | scummvm-rg350-4af25ccfddec83d0525ad43c309fe8d3b751ea7b.tar.gz scummvm-rg350-4af25ccfddec83d0525ad43c309fe8d3b751ea7b.tar.bz2 scummvm-rg350-4af25ccfddec83d0525ad43c309fe8d3b751ea7b.zip |
LURE: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
-rw-r--r-- | engines/lure/game.cpp | 8 | ||||
-rw-r--r-- | engines/lure/hotspots.cpp | 10 | ||||
-rw-r--r-- | engines/lure/intro.cpp | 1 | ||||
-rw-r--r-- | engines/lure/menu.cpp | 4 |
4 files changed, 23 insertions, 0 deletions
diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp index 84cc91ec9a..b1c2283b7e 100644 --- a/engines/lure/game.cpp +++ b/engines/lure/game.cpp @@ -333,6 +333,10 @@ void Game::handleMenuResponse(uint8 selection) { case MENUITEM_SOUND: doSound(); + break; + + default: + break; } } @@ -834,6 +838,10 @@ bool Game::GetTellActions() { *statusLine = '\0'; } } + break; + + default: + break; } } } diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp index 7513575bd4..940215066f 100644 --- a/engines/lure/hotspots.cpp +++ b/engines/lure/hotspots.cpp @@ -2834,6 +2834,9 @@ void HotspotTickHandlers::standardCharacterAnimHandler(Hotspot &h) { h.setOccupied(true); break; + + default: + break; } debugC(ERROR_DETAILED, kLureDebugAnimations, "Hotspot standard character point 7"); } @@ -3151,6 +3154,9 @@ void HotspotTickHandlers::playerAnimHandler(Hotspot &h) { } h.setOccupied(true); break; + + default: + break; } debugC(ERROR_DETAILED, kLureDebugAnimations, "Hotspot player anim handler end"); @@ -3680,6 +3686,9 @@ void HotspotTickHandlers::talkAnimHandler(Hotspot &h) { talkEndConversation(); } break; + + default: + break; } } @@ -3925,6 +3934,7 @@ void HotspotTickHandlers::barmanAnimHandler(Hotspot &h) { break; case WAIT: + default: // Immediate break, since the code outside the switch handles stopping the barman break; } diff --git a/engines/lure/intro.cpp b/engines/lure/intro.cpp index fc02e10667..56f115e02b 100644 --- a/engines/lure/intro.cpp +++ b/engines/lure/intro.cpp @@ -149,6 +149,7 @@ bool Introduction::show() { break; case ABORT_NEXT_SCENE: + default: break; } delete anim; diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp index 8672f5fa87..d074649544 100644 --- a/engines/lure/menu.cpp +++ b/engines/lure/menu.cpp @@ -194,6 +194,8 @@ uint8 Menu::execute() { return MENUITEM_SAVE_GAME; case 3: return MENUITEM_RESTORE_GAME; + default: + break; } } else { switch (_selectedIndex) { @@ -203,6 +205,8 @@ uint8 Menu::execute() { return MENUITEM_TEXT_SPEED; case 3: return MENUITEM_SOUND; + default: + break; } } return MENUITEM_NONE; |