diff options
| author | Strangerke | 2013-09-24 21:24:52 +0200 |
|---|---|---|
| committer | Strangerke | 2013-09-24 21:24:52 +0200 |
| commit | b3f6ce975ff7eb50eb775ce3c5113e85e60c1434 (patch) | |
| tree | 510f3f55b345cdf2c932185b1fb11fa184435277 /engines/avalanche/menu.cpp | |
| parent | 3ae30372bcf3bff39f8d4fd0df65536bc589ae8f (diff) | |
| download | scummvm-rg350-b3f6ce975ff7eb50eb775ce3c5113e85e60c1434.tar.gz scummvm-rg350-b3f6ce975ff7eb50eb775ce3c5113e85e60c1434.tar.bz2 scummvm-rg350-b3f6ce975ff7eb50eb775ce3c5113e85e60c1434.zip | |
AVALANCHE: Use People enum as a type for several variables, modify functions accordingly
Diffstat (limited to 'engines/avalanche/menu.cpp')
| -rw-r--r-- | engines/avalanche/menu.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/avalanche/menu.cpp b/engines/avalanche/menu.cpp index 6af0e79429..0686fbbf44 100644 --- a/engines/avalanche/menu.cpp +++ b/engines/avalanche/menu.cpp @@ -451,9 +451,9 @@ void Menu::setupMenuPeople() { _activeMenuItem.reset(); - for (int i = 150; i <= 178; i++) { - if (_vm->_avalot->getRoom(i) == _vm->_avalot->_room) { - _activeMenuItem.setupOption(_vm->_avalot->getName(i), _vm->_avalot->getNameChar(i), "", true); + for (int i = kPeopleAvalot; i <= kPeopleWisewoman; i++) { + if (_vm->_avalot->getRoom((People)i) == _vm->_avalot->_room) { + _activeMenuItem.setupOption(_vm->_avalot->getName((People)i), _vm->_avalot->getNameChar((People)i), "", true); people += i; } } @@ -582,7 +582,7 @@ void Menu::runMenuAction() { // Get up, pause game, open door, look, inventory, walk/run. switch (_activeMenuItem._choiceNum) { case 0: - _vm->_parser->_person = _vm->_parser->kPardon; + _vm->_parser->_person = kPeoplePardon; _vm->_parser->_thing = _vm->_parser->kPardon; f5Does = _vm->_avalot->f5Does(); _vm->_avalot->callVerb(f5Does[0]); @@ -619,7 +619,7 @@ void Menu::runMenuObjects() { void Menu::runMenuPeople() { _vm->_avalot->thinkAbout(people[_activeMenuItem._choiceNum], Avalot::kPerson); - _vm->_avalot->_lastPerson = people[_activeMenuItem._choiceNum]; + _vm->_avalot->_lastPerson = (People)people[_activeMenuItem._choiceNum]; } void Menu::runMenuWith() { @@ -631,7 +631,7 @@ void Menu::runMenuWith() { if (_vm->_avalot->_verbStr[_activeMenuItem._choiceNum] == Parser::kVerbCodeGive) _vm->_parser->_person = _vm->_avalot->_lastPerson; else - _vm->_parser->_person = Parser::kPardon; + _vm->_parser->_person = kPeoplePardon; } else { switch (_vm->_avalot->_verbStr[_activeMenuItem._choiceNum]) { case 100: // Beer @@ -659,7 +659,7 @@ void Menu::runMenuWith() { _vm->_avalot->callVerb(Parser::kVerbCodeBuy); return; default: - _vm->_parser->_person = _vm->_parser->_thing; + _vm->_parser->_person = (People)_vm->_parser->_thing; _vm->_parser->_thing = Parser::kPardon; _vm->_avalot->_subjectNum = 0; } |