diff options
| author | Strangerke | 2013-09-25 07:57:57 +0200 |
|---|---|---|
| committer | Strangerke | 2013-09-25 07:57:57 +0200 |
| commit | 890eed446c628c8087d728dcc0b9bfba74ec4fcc (patch) | |
| tree | a90363a46e54e5a4c7ae1e5de68c066e4322d39c | |
| parent | 1b1655d0c859bae76ad2f418eb2f7ef62414f2da (diff) | |
| download | scummvm-rg350-890eed446c628c8087d728dcc0b9bfba74ec4fcc.tar.gz scummvm-rg350-890eed446c628c8087d728dcc0b9bfba74ec4fcc.tar.bz2 scummvm-rg350-890eed446c628c8087d728dcc0b9bfba74ec4fcc.zip | |
AVALANCHE: rename a parameter, remove a useless (unitialized) variable, disable some menu entries
| -rw-r--r-- | engines/avalanche/avalot.cpp | 4 | ||||
| -rw-r--r-- | engines/avalanche/avalot.h | 3 | ||||
| -rw-r--r-- | engines/avalanche/menu.cpp | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp index b6c3f0b1b9..a315d5cc90 100644 --- a/engines/avalanche/avalot.cpp +++ b/engines/avalanche/avalot.cpp @@ -1734,8 +1734,8 @@ bool Avalot::setFlag(char x) { return false; } -bool Avalot::decreaseMoney(uint16 howmuchby) { - _money -= howmuchby; +bool Avalot::decreaseMoney(uint16 amount) { + _money -= amount; if (_money < 0) { _vm->_dialogs->displayScrollChain('Q', 2); // "You are now denariusless!" gameOver(); diff --git a/engines/avalanche/avalot.h b/engines/avalanche/avalot.h index ae4024a588..bbd01d7123 100644 --- a/engines/avalanche/avalot.h +++ b/engines/avalanche/avalot.h @@ -265,7 +265,6 @@ public: byte _fieldNum; Common::String _flags; Common::String _listen; - Common::String _atKey; // For XTs, set to "alt-". For ATs, set to "f1". byte _cp, _ledStatus, _defaultLed; FontType _font; bool _alive; @@ -332,7 +331,7 @@ public: void newGame(); // This sets up the DNA for a completely new game. void slowDown(); bool setFlag(char x); - bool decreaseMoney(uint16 howmuchby); // Called pennycheck in the original. + bool decreaseMoney(uint16 amount); // Called pennycheck in the original. void hangAroundForAWhile(); Common::String getName(People whose); diff --git a/engines/avalanche/menu.cpp b/engines/avalanche/menu.cpp index 42a787e046..c3caec7b55 100644 --- a/engines/avalanche/menu.cpp +++ b/engines/avalanche/menu.cpp @@ -401,7 +401,7 @@ Common::String Menu::selectGender(byte x) { void Menu::setupMenuGame() { _activeMenuItem.reset(); _activeMenuItem.setupOption("Help...", 'H', "f1", true); - _activeMenuItem.setupOption("Boss Key", 'B', "alt-B", true); + _activeMenuItem.setupOption("Boss Key", 'B', "alt-B", false); _activeMenuItem.setupOption("Untrash screen", 'U', "ctrl-f7", true); _activeMenuItem.setupOption("Score and rank", 'S', "f9", true); _activeMenuItem.setupOption("About Avvy...", 'A', "shift-f10", true); @@ -414,7 +414,7 @@ void Menu::setupMenuFile() { _activeMenuItem.setupOption("Load...", 'L', "^f3", true); _activeMenuItem.setupOption("Save", 'S', "^f2", _vm->_avalot->_alive); _activeMenuItem.setupOption("Save As...", 'v', "", _vm->_avalot->_alive); - _activeMenuItem.setupOption("DOS Shell", 'D', _vm->_avalot->_atKey + '1', true); + _activeMenuItem.setupOption("DOS Shell", 'D', "alt-1", false); _activeMenuItem.setupOption("Quit", 'Q', "alt-X", true); _activeMenuItem.display(); } |