aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2013-10-11 08:06:16 +0200
committerStrangerke2013-10-11 08:06:16 +0200
commitd202d898da38de1b56f4784c24398ffeb3351e09 (patch)
tree969df6378cb8b8d4c970cc5234ef1898fc42e995 /engines
parentf76284a95eb84f1a44da4c902c1e0ef802f15866 (diff)
downloadscummvm-rg350-d202d898da38de1b56f4784c24398ffeb3351e09.tar.gz
scummvm-rg350-d202d898da38de1b56f4784c24398ffeb3351e09.tar.bz2
scummvm-rg350-d202d898da38de1b56f4784c24398ffeb3351e09.zip
AVALANCHE: Remove code duplicate in runMenuWith()
Diffstat (limited to 'engines')
-rw-r--r--engines/avalanche/menu.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/engines/avalanche/menu.cpp b/engines/avalanche/menu.cpp
index d40397f5a3..1f7006a424 100644
--- a/engines/avalanche/menu.cpp
+++ b/engines/avalanche/menu.cpp
@@ -628,21 +628,15 @@ void Menu::runMenuWith() {
} else {
switch (_verbStr[_activeMenuItem._choiceNum]) {
case 100: // Beer
- _vm->_parser->_thing = 100;
+ case 102: // Whisky
+ case 103: // Cider
+ _vm->_parser->_thing = _verbStr[_activeMenuItem._choiceNum];
_vm->callVerb(kVerbCodeBuy);
return;
case 101: // Wine
_vm->_parser->_thing = 50;
_vm->callVerb(kVerbCodeBuy);
return;
- case 102: // Whisky
- _vm->_parser->_thing = 102;
- _vm->callVerb(kVerbCodeBuy);
- return;
- case 103: // Cider
- _vm->_parser->_thing = 103;
- _vm->callVerb(kVerbCodeBuy);
- return;
case 104: // Mead
_vm->_parser->_thing = 107;
_vm->callVerb(kVerbCodeBuy);
@@ -833,6 +827,6 @@ void Menu::init() {
}
void Menu::resetVariables() {
- _lastPerson = kPeoplePardon; // = Pardon?
+ _lastPerson = kPeoplePardon;
}
} // End of namespace Avalanche.