diff options
author | D G Turner | 2019-10-15 21:46:14 +0100 |
---|---|---|
committer | D G Turner | 2019-10-15 21:46:14 +0100 |
commit | 66011fcae80b84620d2b1f0c466f75e03fb113d7 (patch) | |
tree | 0566a5cf1d7a5e401e5fa022f0b295e88f8e1f28 /engines/avalanche/dropdown.cpp | |
parent | 06b038a1c15d1486fc3466050391e12d22b5356a (diff) | |
download | scummvm-rg350-66011fcae80b84620d2b1f0c466f75e03fb113d7.tar.gz scummvm-rg350-66011fcae80b84620d2b1f0c466f75e03fb113d7.tar.bz2 scummvm-rg350-66011fcae80b84620d2b1f0c466f75e03fb113d7.zip |
AVALANCHE: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/avalanche/dropdown.cpp')
-rw-r--r-- | engines/avalanche/dropdown.cpp | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/engines/avalanche/dropdown.cpp b/engines/avalanche/dropdown.cpp index ba4e452aaa..a8f902eb5a 100644 --- a/engines/avalanche/dropdown.cpp +++ b/engines/avalanche/dropdown.cpp @@ -526,6 +526,8 @@ void DropDownMenu::setupMenuWith() { _activeMenuItem.setupOption("Buy an onion", 'o', "", !_vm->_objects[kObjectOnion - 1]); _verbStr = _verbStr + 105; break; + default: + break; } } _activeMenuItem.display(); @@ -549,6 +551,8 @@ void DropDownMenu::runMenuGame() { case 4: _vm->callVerb(kVerbCodeInfo); break; + default: + break; } } @@ -576,6 +580,8 @@ void DropDownMenu::runMenuFile() { case 5: _vm->callVerb(kVerbCodeQuit); break; + default: + break; } } @@ -613,6 +619,8 @@ void DropDownMenu::runMenuAction() { _vm->_animation->updateSpeed(); } break; + default: + break; } } @@ -809,23 +817,27 @@ Common::String DropDownMenu::getThing(byte which) { switch (which) { case kObjectWine: switch (_vm->_wineState) { - case 1: - case 4: - result = Common::String(things[which - 1]); - break; - case 3: - result = "Vinegar"; - break; + case 1: + case 4: + result = Common::String(things[which - 1]); + break; + case 3: + result = "Vinegar"; + break; + default: + break; } break; case kObjectOnion: - if (_vm->_rottenOnion) + if (_vm->_rottenOnion) { result = Common::String("rotten onion"); - else + } else { result = Common::String(things[which - 1]); + } break; default: result = Common::String(things[which - 1]); + break; } return result; } |