diff options
-rw-r--r-- | engines/avalanche/acci2.cpp | 4 | ||||
-rw-r--r-- | engines/avalanche/animation.cpp | 8 | ||||
-rw-r--r-- | engines/avalanche/avalot.cpp | 2 | ||||
-rw-r--r-- | engines/avalanche/dropdown2.cpp | 60 | ||||
-rw-r--r-- | engines/avalanche/lucerna2.cpp | 14 | ||||
-rw-r--r-- | engines/avalanche/parser.cpp | 2 | ||||
-rw-r--r-- | engines/avalanche/timer.cpp | 4 |
7 files changed, 47 insertions, 47 deletions
diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp index cec9c422f9..ffcc8e57f6 100644 --- a/engines/avalanche/acci2.cpp +++ b/engines/avalanche/acci2.cpp @@ -1154,7 +1154,7 @@ void Acci::standUp() { _vm->_animation->_sprites[0]._visible = true; _vm->_gyro->_dna._userMovesAvvy = true; _vm->_animation->appearPed(1, 2); - _vm->_gyro->_dna._direction = _vm->_gyro->kDirectionLeft; + _vm->_gyro->_dna._direction = Gyro::kDirectionLeft; _vm->_celer->drawBackgroundSprite(-1, -1, 4); // Picture of empty pillow. _vm->_lucerna->incScore(1); _vm->_gyro->_dna._avvyInBed = false; @@ -1719,7 +1719,7 @@ void Acci::doThat() { _vm->_animation->appearPed(2, 4); _vm->_animation->_sprites[1].walkTo(5); _vm->_animation->_sprites[1]._callEachStepFl = true; - _vm->_animation->_sprites[1]._eachStepProc = _vm->_animation->kProcBackAndForth; + _vm->_animation->_sprites[1]._eachStepProc = Animation::kProcBackAndForth; _vm->_gyro->_dna._avariciusTalk = 14; _vm->_timer->addTimer(177, Timer::kProcAvariciusTalks, Timer::kReasonAvariciusTalks); } diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp index 747f014dfb..5bff12307b 100644 --- a/engines/avalanche/animation.cpp +++ b/engines/avalanche/animation.cpp @@ -322,14 +322,14 @@ void AnimationType::setSpeed(int8 xx, int8 yy) { if (_moveX == 0) { // No horz movement if (_moveY < 0) - turn(_anim->kDirUp); + turn(Animation::kDirUp); else - turn(_anim->kDirDown); + turn(Animation::kDirDown); } else { if (_moveX < 0) - turn(_anim->kDirLeft); + turn(Animation::kDirLeft); else - turn(_anim->kDirRight); + turn(Animation::kDirRight); } } diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp index af0079099d..f6fb1ed592 100644 --- a/engines/avalanche/avalot.cpp +++ b/engines/avalanche/avalot.cpp @@ -149,7 +149,7 @@ void Avalot::setup() { _vm->_gyro->_ledStatus = 177; _vm->_gyro->_defaultLed = 2; // TSkellern = 0; Replace with a more local variable sometime - _vm->_gyro->_dna._direction = _vm->_gyro->kDirectionStopped; + _vm->_gyro->_dna._direction = Gyro::kDirectionStopped; _vm->_gyro->_enidFilename = ""; // Undefined. _vm->_lucerna->drawToolbar(); _vm->_scrolls->setReadyLight(2); diff --git a/engines/avalanche/dropdown2.cpp b/engines/avalanche/dropdown2.cpp index 0a5fe9f4d3..a934ed0f58 100644 --- a/engines/avalanche/dropdown2.cpp +++ b/engines/avalanche/dropdown2.cpp @@ -285,26 +285,26 @@ void Dropdown::findWhatYouCanDoWithIt() { case Gyro::kObjectWine: case Gyro::kObjectPotion: case Gyro::kObjectInk: - _vm->_gyro->_verbStr = Common::String(_vm->_acci->kVerbCodeExam) + _vm->_acci->kVerbCodeDrink; + _vm->_gyro->_verbStr = Common::String(Acci::kVerbCodeExam) + Acci::kVerbCodeDrink; break; case Gyro::kObjectBell: - _vm->_gyro->_verbStr = Common::String(_vm->_acci->kVerbCodeExam) + _vm->_acci->kVerbCodeRing; + _vm->_gyro->_verbStr = Common::String(Acci::kVerbCodeExam) + Acci::kVerbCodeRing; break; case Gyro::kObjectChastity: - _vm->_gyro->_verbStr = Common::String(_vm->_acci->kVerbCodeExam) + _vm->_acci->kVerbCodeWear; + _vm->_gyro->_verbStr = Common::String(Acci::kVerbCodeExam) + Acci::kVerbCodeWear; break; case Gyro::kObjectLute: - _vm->_gyro->_verbStr = Common::String(_vm->_acci->kVerbCodeExam) + _vm->_acci->kVerbCodePlay; + _vm->_gyro->_verbStr = Common::String(Acci::kVerbCodeExam) + Acci::kVerbCodePlay; break; case Gyro::kObjectMushroom: case Gyro::kObjectOnion: - _vm->_gyro->_verbStr = Common::String(_vm->_acci->kVerbCodeExam) + _vm->_acci->kVerbCodeEat; + _vm->_gyro->_verbStr = Common::String(Acci::kVerbCodeExam) + Acci::kVerbCodeEat; break; case Gyro::kObjectClothes: - _vm->_gyro->_verbStr = Common::String(_vm->_acci->kVerbCodeExam) + _vm->_acci->kVerbCodeWear; + _vm->_gyro->_verbStr = Common::String(Acci::kVerbCodeExam) + Acci::kVerbCodeWear; break; default: - _vm->_gyro->_verbStr = _vm->_acci->kVerbCodeExam; // Anything else. + _vm->_gyro->_verbStr = Acci::kVerbCodeExam; // Anything else. } } @@ -508,22 +508,22 @@ void Dropdown::setupMenuWith() { _activeMenuItem.setupOption("Give to...", 'G', "", false); // Not here. else { _activeMenuItem.setupOption(Common::String("Give to ") + _vm->_gyro->getName(_vm->_gyro->_lastPerson), 'G', "", true); - _vm->_gyro->_verbStr = _vm->_gyro->_verbStr + _vm->_acci->kVerbCodeGive; + _vm->_gyro->_verbStr = _vm->_gyro->_verbStr + Acci::kVerbCodeGive; } } else { _activeMenuItem.setupOption("Examine", 'x', "", true); _activeMenuItem.setupOption(Common::String("Talk to h") + selectGender(_vm->_gyro->_thinks), 'T', "", true); - _vm->_gyro->_verbStr = Common::String(_vm->_acci->kVerbCodeExam) + _vm->_acci->kVerbCodeTalk; + _vm->_gyro->_verbStr = Common::String(Acci::kVerbCodeExam) + Acci::kVerbCodeTalk; switch (_vm->_gyro->_thinks) { case Gyro::kPeopleGeida: case Gyro::kPeopleArkata: { _activeMenuItem.setupOption("Kiss her", 'K', "", true); - _vm->_gyro->_verbStr = _vm->_gyro->_verbStr + _vm->_acci->kVerbCodeKiss; + _vm->_gyro->_verbStr = _vm->_gyro->_verbStr + Acci::kVerbCodeKiss; } break; case Gyro::kPeopleDogfood: { _activeMenuItem.setupOption("Play his game", 'P', "", !_vm->_gyro->_dna._wonNim); // True if you HAVEN'T won. - _vm->_gyro->_verbStr = _vm->_gyro->_verbStr + _vm->_acci->kVerbCodePlay; + _vm->_gyro->_verbStr = _vm->_gyro->_verbStr + Acci::kVerbCodePlay; } break; case Gyro::kPeopleMalagauche: { @@ -550,19 +550,19 @@ void Dropdown::runMenuGame() { // Help, boss, untrash screen. switch (_activeMenuItem._choiceNum) { case 0: - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeHelp); + _vm->_lucerna->callVerb(Acci::kVerbCodeHelp); break; case 1: - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeBoss); + _vm->_lucerna->callVerb(Acci::kVerbCodeBoss); break; case 2: _vm->_lucerna->majorRedraw(); break; case 3: - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeScore); + _vm->_lucerna->callVerb(Acci::kVerbCodeScore); break; case 4: - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeInfo); + _vm->_lucerna->callVerb(Acci::kVerbCodeInfo); break; } } @@ -571,18 +571,18 @@ void Dropdown::runMenuFile() { // New game, load, save, save as, DOS shell, about, quit. switch (_activeMenuItem._choiceNum) { case 0: - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeRestart); + _vm->_lucerna->callVerb(Acci::kVerbCodeRestart); break; case 1: { if (!_vm->_acci->_realWords[1].empty()) _vm->_acci->_realWords[1].clear(); - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeLoad); + _vm->_lucerna->callVerb(Acci::kVerbCodeLoad); } break; case 2: { if (!_vm->_acci->_realWords[1].empty()) _vm->_acci->_realWords[1].clear(); - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeSave); + _vm->_lucerna->callVerb(Acci::kVerbCodeSave); } break; case 3: @@ -593,7 +593,7 @@ void Dropdown::runMenuFile() { _vm->_enid->backToBootstrap(2); break; case 5: - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeQuit); + _vm->_lucerna->callVerb(Acci::kVerbCodeQuit); break; } } @@ -611,17 +611,17 @@ void Dropdown::runMenuAction() { break; case 1: _vm->_acci->_thing = _vm->_acci->kPardon; - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodePause); + _vm->_lucerna->callVerb(Acci::kVerbCodePause); break; case 2: - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeOpen); + _vm->_lucerna->callVerb(Acci::kVerbCodeOpen); break; case 3: _vm->_acci->_thing = _vm->_acci->kPardon; - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeLook); + _vm->_lucerna->callVerb(Acci::kVerbCodeLook); break; case 4: - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeInv); + _vm->_lucerna->callVerb(Acci::kVerbCodeInv); break; case 5: { if (_vm->_animation->_sprites[0]._speedX == _vm->_gyro->kWalk) @@ -650,7 +650,7 @@ void Dropdown::runMenuWith() { _vm->_acci->_thing += 49; - if (_vm->_gyro->_verbStr[_activeMenuItem._choiceNum] == _vm->_acci->kVerbCodeGive) + if (_vm->_gyro->_verbStr[_activeMenuItem._choiceNum] == Acci::kVerbCodeGive) _vm->_acci->_person = _vm->_gyro->_lastPerson; else _vm->_acci->_person = 254; @@ -659,37 +659,37 @@ void Dropdown::runMenuWith() { switch (_vm->_gyro->_verbStr[_activeMenuItem._choiceNum]) { case 100: { // Beer _vm->_acci->_thing = 100; - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeBuy); + _vm->_lucerna->callVerb(Acci::kVerbCodeBuy); return; } break; case 101: { // Wine _vm->_acci->_thing = 50; - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeBuy); + _vm->_lucerna->callVerb(Acci::kVerbCodeBuy); return; } break; case 102: { // Whisky _vm->_acci->_thing = 102; - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeBuy); + _vm->_lucerna->callVerb(Acci::kVerbCodeBuy); return; } break; case 103: { // Cider _vm->_acci->_thing = 103; - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeBuy); + _vm->_lucerna->callVerb(Acci::kVerbCodeBuy); return; } break; case 104: { // Mead _vm->_acci->_thing = 107; - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeBuy); + _vm->_lucerna->callVerb(Acci::kVerbCodeBuy); return; } break; case 105: { // Onion (trader) _vm->_acci->_thing = 67; - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeBuy); + _vm->_lucerna->callVerb(Acci::kVerbCodeBuy); return; } break; diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp index ccb85b49c0..3fe95603c1 100644 --- a/engines/avalanche/lucerna2.cpp +++ b/engines/avalanche/lucerna2.cpp @@ -418,7 +418,7 @@ void Lucerna::putGeidaAt(byte whichPed, byte &ped) { _vm->_animation->_sprites[1].init(5, false, _vm->_animation); // load Geida _vm->_animation->appearPed(2, whichPed); _vm->_animation->_sprites[1]._callEachStepFl = true; - _vm->_animation->_sprites[1]._eachStepProc = _vm->_animation->kProcGeida; + _vm->_animation->_sprites[1]._eachStepProc = Animation::kProcGeida; } void Lucerna::enterRoom(byte room, byte ped) { @@ -471,7 +471,7 @@ void Lucerna::enterRoom(byte room, byte ped) { } _vm->_animation->_sprites[1]._callEachStepFl = true; - _vm->_animation->_sprites[1]._eachStepProc = _vm->_animation->kProcFaceAvvy; // He always faces Avvy. + _vm->_animation->_sprites[1]._eachStepProc = Animation::kProcFaceAvvy; // He always faces Avvy. } else _vm->_gyro->_whereIs[Gyro::kPeopleCrapulus - 150] = r__nowhere; @@ -503,7 +503,7 @@ void Lucerna::enterRoom(byte room, byte ped) { _vm->_gyro->_dna._dogFoodPos = 0; // _vm->_gyro->also Spludwick pos. _vm->_animation->_sprites[1]._callEachStepFl = true; - _vm->_animation->_sprites[1]._eachStepProc = _vm->_animation->kProcGeida; + _vm->_animation->_sprites[1]._eachStepProc = Animation::kProcGeida; } else _vm->_gyro->_whereIs[1] = r__nowhere; break; @@ -518,7 +518,7 @@ void Lucerna::enterRoom(byte room, byte ped) { if (ped > 0) { _vm->_animation->_sprites[1].init(4, false, _vm->_animation); // 4 = Cwytalot _vm->_animation->_sprites[1]._callEachStepFl = true; - _vm->_animation->_sprites[1]._eachStepProc = _vm->_animation->kProcFollowAvvyY; + _vm->_animation->_sprites[1]._eachStepProc = Animation::kProcFollowAvvyY; _vm->_gyro->_whereIs[Gyro::kPeopleCwytalot - 150] = r__brummieroad; if (_vm->_gyro->_dna._roomCount[r__brummieroad] == 1) { // First time here... @@ -732,7 +732,7 @@ void Lucerna::enterRoom(byte room, byte ped) { } _vm->_animation->_sprites[1]._callEachStepFl = true; - _vm->_animation->_sprites[1]._eachStepProc = _vm->_animation->kProcFaceAvvy; // She always faces Avvy. + _vm->_animation->_sprites[1]._eachStepProc = Animation::kProcFaceAvvy; // She always faces Avvy. break; case r__insidecardiffcastle: @@ -1138,13 +1138,13 @@ void Lucerna::checkClick() { _vm->_acci->_person = _vm->_gyro->_thinks; _vm->_acci->_thing = _vm->_acci->kPardon; } - callVerb(_vm->_acci->kVerbCodeExam); + callVerb(Acci::kVerbCodeExam); } else if ((261 <= cursorPos.x) && (cursorPos.x <= 319)) { // Display the score. do { _vm->updateEvents(); } while (_holdLeftMouse); - callVerb(_vm->_acci->kVerbCodeScore); + callVerb(Acci::kVerbCodeScore); } else if ((320 <= cursorPos.x) && (cursorPos.x <= 357)) { // Change speed. _vm->_animation->_sprites[0]._speedX = _vm->_gyro->kWalk; _vm->_animation->updateSpeed(); diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp index a378b0d54b..9be66ef1cf 100644 --- a/engines/avalanche/parser.cpp +++ b/engines/avalanche/parser.cpp @@ -100,7 +100,7 @@ void Parser::handleFunctionKey(const Common::Event &event) { } break; case Common::KEYCODE_F7: - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeOpen); + _vm->_lucerna->callVerb(Acci::kVerbCodeOpen); break; default: break; diff --git a/engines/avalanche/timer.cpp b/engines/avalanche/timer.cpp index c2fa073160..b88c53d155 100644 --- a/engines/avalanche/timer.cpp +++ b/engines/avalanche/timer.cpp @@ -311,7 +311,7 @@ void Timer::getTiedUp() { _vm->_animation->_sprites[1].stopWalk(); _vm->_animation->_sprites[1].stopHoming(); _vm->_animation->_sprites[1]._callEachStepFl = true; - _vm->_animation->_sprites[1]._eachStepProc = _vm->_animation->kProcGrabAvvy; + _vm->_animation->_sprites[1]._eachStepProc = Animation::kProcGrabAvvy; addTimer(70, kProcGetTiedUp2, kReasonGettingTiedUp); } @@ -642,7 +642,7 @@ void Timer::winning() { #endif // TODO: To be implemented with Pingo::winningPic(). - _vm->_lucerna->callVerb(_vm->_acci->kVerbCodeScore); + _vm->_lucerna->callVerb(Acci::kVerbCodeScore); _vm->_scrolls->displayText(" T H E E N D "); _vm->_gyro->_letMeOut = true; } |