diff options
author | Strangerke | 2016-05-03 07:47:15 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2016-05-10 12:14:49 +0200 |
commit | aee38421631479b6025585649172491f3251ce5e (patch) | |
tree | 5f07886ddccfcb53aa322e50cd97cffb88f6ccf1 | |
parent | 99580a1b088c9e199a50116dc3dca915142b7547 (diff) | |
download | scummvm-rg350-aee38421631479b6025585649172491f3251ce5e.tar.gz scummvm-rg350-aee38421631479b6025585649172491f3251ce5e.tar.bz2 scummvm-rg350-aee38421631479b6025585649172491f3251ce5e.zip |
GNAP: Some renaming
-rw-r--r-- | engines/gnap/gamesys.cpp | 1 | ||||
-rw-r--r-- | engines/gnap/gnap.cpp | 6 | ||||
-rw-r--r-- | engines/gnap/gnap.h | 7 | ||||
-rw-r--r-- | engines/gnap/scenes/group0.cpp | 12 | ||||
-rw-r--r-- | engines/gnap/scenes/group1.cpp | 56 | ||||
-rw-r--r-- | engines/gnap/scenes/group2.cpp | 2 | ||||
-rw-r--r-- | engines/gnap/scenes/group3.cpp | 2 | ||||
-rw-r--r-- | engines/gnap/scenes/group4.cpp | 2 | ||||
-rw-r--r-- | engines/gnap/scenes/scenecore.cpp | 4 |
9 files changed, 45 insertions, 47 deletions
diff --git a/engines/gnap/gamesys.cpp b/engines/gnap/gamesys.cpp index ad9d0da35f..6a9cc0f10d 100644 --- a/engines/gnap/gamesys.cpp +++ b/engines/gnap/gamesys.cpp @@ -184,7 +184,6 @@ void GameSys::setBackgroundSurface(Graphics::Surface *surface, int a4, int a5, i } memcpy(_frontSurface->getPixels(), surface->getPixels(), surface->pitch * surface->h); - _vm->_system->copyRectToScreen(_frontSurface->getPixels(), _frontSurface->pitch, 0, 0, _frontSurface->w, _frontSurface->h); _backgroundImageValue1 = a4; diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp index c17790f707..e5169e4927 100644 --- a/engines/gnap/gnap.cpp +++ b/engines/gnap/gnap.cpp @@ -1672,7 +1672,7 @@ void GnapEngine::gnapInitBrainPulseRndValue() { _gnapBrainPulseRndValue = 2 * getRandom(10); } -void GnapEngine::gnapUseDeviceOnPlatypuss() { +void GnapEngine::gnapUseDeviceOnPlatypus() { playGnapSequence(makeRid(1, getGnapSequenceId(gskPullOutDevice, _platX, _platY))); if (_platypusFacing != kDirNone) { @@ -1805,7 +1805,7 @@ void GnapEngine::gnapUseDisguiseOnPlatypus() { _newSceneNum = 47; _isLeavingScene = true; _sceneDone = true; - setFlag(kGFPlatyPussDisguised); + setFlag(kGFPlatypusDisguised); } int GnapEngine::getPlatypusSequenceId() { @@ -1868,7 +1868,7 @@ void GnapEngine::updatePlatypusIdleSequence() { } } -void GnapEngine::platypusSub426234() { +void GnapEngine::updatePlatypusIdleSequence2() { if (_platypusActionStatus < 0 && _gnapActionStatus < 0) { if (_timers[0]) { if (!_timers[1]) { diff --git a/engines/gnap/gnap.h b/engines/gnap/gnap.h index 8f86a866c0..b388022231 100644 --- a/engines/gnap/gnap.h +++ b/engines/gnap/gnap.h @@ -183,7 +183,7 @@ enum { kGFBarnPadlockOpen = 7, kGFTruckFilledWithGas = 8, kGFTruckKeysUsed = 9, - kGFPlatyPussDisguised = 10, + kGFPlatypusDisguised = 10, kGFSceneFlag1 = 11, kGFGnapControlsToyUFO = 12, kGFUnk13 = 13, // Tongue Fight Won? @@ -550,7 +550,7 @@ public: void updateGnapIdleSequence2(); void initGnapPos(int gridX, int gridY, Facing facing); void gnapInitBrainPulseRndValue(); - void gnapUseDeviceOnPlatypuss(); + void gnapUseDeviceOnPlatypus(); void doCallback(int callback); bool gnapPlatypusAction(int gridX, int gridY, int platSequenceId, int callback); void gnapKissPlatypus(int callback); @@ -564,11 +564,10 @@ public: int getPlatypusSequenceId(); void playPlatypusSequence(int sequenceId); void updatePlatypusIdleSequence(); - void platypusSub426234(); + void updatePlatypusIdleSequence2(); void initPlatypusPos(int gridX, int gridY, Facing facing); // Scenes - int _toyUfoNextSequenceId, _toyUfoSequenceId; int _toyUfoId; int _toyUfoActionStatus; diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp index d7f8aecfd2..4ec0d88c61 100644 --- a/engines/gnap/scenes/group0.cpp +++ b/engines/gnap/scenes/group0.cpp @@ -1376,7 +1376,7 @@ void Scene04::run() { _vm->queueInsertDeviceIcon(); - if (_vm->isFlag(kGFPlatyPussDisguised)) { + if (_vm->isFlag(kGFPlatypusDisguised)) { _vm->_timers[3] = 300; // TODO setCursor((LPCSTR)IDC_WAIT); _vm->setGrabCursorSprite(kItemKeys); @@ -1394,7 +1394,7 @@ void Scene04::run() { _vm->invRemove(kItemDisguise); _vm->invAdd(kItemKeys); _vm->setFlag(kGFKeysTaken); - _vm->clearFlag(kGFPlatyPussDisguised); + _vm->clearFlag(kGFPlatypusDisguised); _vm->_platypusSequenceId = 0x20C; _vm->_platypusSequenceDatNum = 0; _vm->_platypusFacing = kDirBottomRight; @@ -1667,7 +1667,7 @@ void Scene04::run() { if (!_vm->_isLeavingScene) { if (_vm->_platypusActionStatus < 0 && _vm->isFlag(kGFPlatypus)) - _vm->platypusSub426234(); + _vm->updatePlatypusIdleSequence2(); if (_vm->_gnapActionStatus < 0) _vm->updateGnapIdleSequence2(); if (!_vm->_timers[5]) { @@ -1965,7 +1965,7 @@ void Scene05::run() { break; case PLAT_CURSOR: if (_vm->isFlag(kGFPlatypus)) { - _vm->gnapUseDeviceOnPlatypuss(); + _vm->gnapUseDeviceOnPlatypus(); if (_vm->platypusWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 1, 0x107C2, 1)) { _vm->_platypusActionStatus = kAS05PlatSearchHaystack; _vm->_platypusFacing = kDirUnk4; @@ -3057,7 +3057,7 @@ void Scene08::run() { break; case PLAT_CURSOR: _vm->gnapActionIdle(0x14D); - _vm->gnapUseDeviceOnPlatypuss(); + _vm->gnapUseDeviceOnPlatypus(); _vm->platypusWalkTo(6, 6, 1, 0x107C2, 1); _vm->_platypusActionStatus = kAS08PlatWithMan; _vm->_platypusFacing = kDirNone; @@ -3093,7 +3093,7 @@ void Scene08::run() { case PLAT_CURSOR: _vm->setFlag(kGFSceneFlag1); _vm->gnapActionIdle(0x14D); - _vm->gnapUseDeviceOnPlatypuss(); + _vm->gnapUseDeviceOnPlatypus(); _vm->platypusWalkTo(3, 7, 1, 0x107C2, 1); _vm->_platypusActionStatus = kAS08PlatWithDog; _vm->_platypusFacing = kDirNone; diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp index 22fa7a1dba..bd77c3c133 100644 --- a/engines/gnap/scenes/group1.cpp +++ b/engines/gnap/scenes/group1.cpp @@ -169,7 +169,7 @@ void Scene10::run() { break; case PLAT_CURSOR: _vm->gnapActionIdle(0x10C); - _vm->gnapUseDeviceOnPlatypuss(); + _vm->gnapUseDeviceOnPlatypus(); _vm->platypusWalkTo(4, 6, -1, -1, 1); _vm->gnapWalkTo(4, 8, 0, 0x107BB, 1); _vm->_gnapActionStatus = kAS10AnnoyCook; @@ -206,7 +206,7 @@ void Scene10::run() { _vm->playGnapMoan2(-1, -1); else { _vm->gnapActionIdle(0x10C); - _vm->gnapUseDeviceOnPlatypuss(); + _vm->gnapUseDeviceOnPlatypus(); _vm->platypusWalkTo(3, 7, -1, -1, 1); _vm->gnapWalkTo(4, 8, 0, 0x107BB, 1); _vm->_gnapActionStatus = kAS10AnnoyCook; @@ -239,7 +239,7 @@ void Scene10::run() { _vm->invAdd(kItemTongs); _vm->setFlag(kGFMudTaken); _vm->gnapActionIdle(0x10C); - _vm->gnapUseDeviceOnPlatypuss(); + _vm->gnapUseDeviceOnPlatypus(); _vm->platypusWalkTo(7, 6, 1, 0x107D2, 1); _vm->_platypusActionStatus = kAS10PlatWithBox; _vm->_platypusFacing = kDirUnk4; @@ -747,7 +747,7 @@ void Scene11::run() { gameSys.setAnimation(0x207, 257, 4); gameSys.insertSequence(0x207, 257, 0, 0, kSeqNone, 0, 0, 0); } - _vm->platypusSub426234(); + _vm->updatePlatypusIdleSequence2(); _vm->updateGnapIdleSequence2(); if (!_vm->_timers[5]) { _vm->_timers[5] = _vm->getRandom(100) + 75; @@ -1071,7 +1071,7 @@ void Scene12::run() { _vm->_gnapActionStatus = kAS12TalkToothGuy; break; case PLAT_CURSOR: - _vm->gnapUseDeviceOnPlatypuss(); + _vm->gnapUseDeviceOnPlatypus(); _vm->platypusWalkTo(3, 7, 1, 0x107D2, 1); _vm->_platypusActionStatus = kAS12PlatWithToothGuy; _vm->_platypusFacing = kDirUnk4; @@ -1141,7 +1141,7 @@ void Scene12::run() { _vm->_gnapActionStatus = kAS12TalkBeardGuy; break; case PLAT_CURSOR: - _vm->gnapUseDeviceOnPlatypuss(); + _vm->gnapUseDeviceOnPlatypus(); _vm->platypusWalkTo(7, 6, 1, 0x107C2, 1); _vm->_platypusActionStatus = kAS12PlatWithBeardGuy; _vm->_platypusFacing = kDirNone; @@ -2539,7 +2539,7 @@ void Scene17::run() { if (_vm->isFlag(kGFGrassTaken)) { _vm->gnapUseJointOnPlatypus(); } else { - _vm->gnapUseDeviceOnPlatypuss(); + _vm->gnapUseDeviceOnPlatypus(); _vm->platypusWalkTo(_vm->_hotspotsWalkPos[6].x, _vm->_hotspotsWalkPos[6].y, 1, 0x107C2, 1); _vm->gnapWalkTo(_vm->_hotspotsWalkPos[6].x + 1, _vm->_hotspotsWalkPos[6].y, 0, 0x107BA, 1); _vm->_platypusActionStatus = kAS17GetWrench1; @@ -2586,7 +2586,7 @@ void Scene17::run() { case PLAT_CURSOR: if (_canTryGetWrench) { platHangUpPhone(); - _vm->gnapUseDeviceOnPlatypuss(); + _vm->gnapUseDeviceOnPlatypus(); _vm->platypusWalkTo(_vm->_hotspotsWalkPos[6].x + 1, _vm->_hotspotsWalkPos[6].y, 1, 0x107C2, 1); _vm->_platypusActionStatus = kAS17TryGetWrench; _vm->_gnapActionStatus = kAS17TryGetWrench; @@ -2626,7 +2626,7 @@ void Scene17::run() { if (_vm->isFlag(kGFUnk18)) { platHangUpPhone(); _vm->_isLeavingScene = true; - _vm->gnapUseDeviceOnPlatypuss(); + _vm->gnapUseDeviceOnPlatypus(); _vm->_platypusFacing = kDirUpLeft; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 1, 0x107C2, 1); _vm->setFlag(kGFUnk16); @@ -2670,7 +2670,7 @@ void Scene17::run() { if (_vm->isFlag(kGFUnk18)) { platHangUpPhone(); _vm->_isLeavingScene = true; - _vm->gnapUseDeviceOnPlatypuss(); + _vm->gnapUseDeviceOnPlatypus(); _vm->_platypusFacing = kDirUpLeft; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 1, 0x107C2, 1); _vm->setFlag(kGFUnk16); @@ -2730,7 +2730,7 @@ void Scene17::run() { if (!_vm->_isLeavingScene) { if (_vm->_platypusActionStatus < 0) - _vm->platypusSub426234(); + _vm->updatePlatypusIdleSequence2(); _vm->updateGnapIdleSequence2(); if (!_vm->_timers[4]) { _vm->_timers[4] = _vm->getRandom(100) + 200; @@ -3143,7 +3143,7 @@ void Scene18::updateHotspots() { _vm->_hotspotsWalkPos[kHS18GarbageCan].x = 3; _vm->_hotspotsWalkPos[kHS18GarbageCan].y = 7; } - if (_vm->isFlag(kGFPlatyPussDisguised)) + if (_vm->isFlag(kGFPlatypusDisguised)) _vm->_hotspots[kHS18GarbageCan]._flags = SF_DISABLED; if (_vm->isFlag(kGFPlatypusTalkingToAssistant)) { _vm->_hotspots[kHS18Device]._flags = SF_DISABLED; @@ -3259,7 +3259,7 @@ void Scene18::putDownGarbageCan(int animationIndex) { _vm->_s18GarbageCanPos = _vm->_gnapX - 1; else _vm->_s18GarbageCanPos = _vm->_gnapX + 1; - _vm->clearFlag(kGFPlatyPussDisguised); + _vm->clearFlag(kGFPlatypusDisguised); updateHotspots(); if (_vm->_gnapIdleFacing != kDirNone && _vm->_gnapIdleFacing != kDirBottomRight && _vm->_gnapIdleFacing != kDirUpRight) { gameSys.insertSequence(0x107BA, _vm->_gnapId, @@ -3342,7 +3342,7 @@ void Scene18::run() { _vm->startSoundTimerA(4); _vm->_timers[5] = _vm->getRandom(100) + 100; _vm->queueInsertDeviceIcon(); - _vm->clearFlag(kGFPlatyPussDisguised); + _vm->clearFlag(kGFPlatypusDisguised); if (!_vm->isFlag(kGFUnk14)) gameSys.insertSequence(0x1F8, 19, 0, 0, kSeqNone, 0, 0, 0); @@ -3440,7 +3440,7 @@ void Scene18::run() { case kHS18Platypus: if (_vm->_gnapActionStatus < 0) { - if (_vm->isFlag(kGFPlatyPussDisguised)) { + if (_vm->isFlag(kGFPlatypusDisguised)) { gnapCarryGarbageCanTo(-1); putDownGarbageCan(0); } @@ -3473,7 +3473,7 @@ void Scene18::run() { _vm->_gnapActionStatus = kAS18GrabCowboyHat; _vm->_sceneWaiting = false; } else if (_vm->_gnapActionStatus < 0) { - if (_vm->isFlag(kGFPlatyPussDisguised)) { + if (_vm->isFlag(kGFPlatypusDisguised)) { gnapCarryGarbageCanTo(-1); putDownGarbageCan(0); } @@ -3543,7 +3543,7 @@ void Scene18::run() { case kHS18HydrantTopValve: if (_vm->_gnapActionStatus < 0) { - if (_vm->isFlag(kGFPlatyPussDisguised)) { + if (_vm->isFlag(kGFPlatypusDisguised)) { // While carrying garbage can if (_vm->_grabCursorSpriteIndex >= 0) { gnapCarryGarbageCanTo(-1); @@ -3616,7 +3616,7 @@ void Scene18::run() { _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS18HydrantRightValve].x, _vm->_hotspotsWalkPos[kHS18HydrantRightValve].y, 1, 5); } } else { - if (_vm->isFlag(kGFPlatyPussDisguised)) { + if (_vm->isFlag(kGFPlatypusDisguised)) { gnapCarryGarbageCanTo(-1); putDownGarbageCan(0); } @@ -3654,7 +3654,7 @@ void Scene18::run() { case kHS18ExitToyStore: if (_vm->_gnapActionStatus < 0) { - if (_vm->isFlag(kGFPlatyPussDisguised)) { + if (_vm->isFlag(kGFPlatypusDisguised)) { gnapCarryGarbageCanTo(-1); putDownGarbageCan(0); } @@ -3673,7 +3673,7 @@ void Scene18::run() { case kHS18ExitPhoneBooth: if (_vm->_gnapActionStatus < 0) { - if (_vm->isFlag(kGFPlatyPussDisguised)) { + if (_vm->isFlag(kGFPlatypusDisguised)) { gnapCarryGarbageCanTo(-1); putDownGarbageCan(0); } @@ -3691,7 +3691,7 @@ void Scene18::run() { case kHS18ExitGrubCity: if (_vm->_gnapActionStatus < 0) { - if (_vm->isFlag(kGFPlatyPussDisguised)) { + if (_vm->isFlag(kGFPlatypusDisguised)) { gnapCarryGarbageCanTo(-1); putDownGarbageCan(0); } @@ -3712,7 +3712,7 @@ void Scene18::run() { case kHS18WalkArea1: case kHS18WalkArea2: if (_vm->_gnapActionStatus < 0) { - if (_vm->isFlag(kGFPlatyPussDisguised)) { + if (_vm->isFlag(kGFPlatypusDisguised)) { gnapCarryGarbageCanTo(-1); putDownGarbageCan(0); } else { @@ -3724,7 +3724,7 @@ void Scene18::run() { default: if (_vm->_gnapActionStatus != kAS18StandingOnHydrant && _vm->_mouseClickState._left) { - if (_vm->isFlag(kGFPlatyPussDisguised)) { + if (_vm->isFlag(kGFPlatypusDisguised)) { gnapCarryGarbageCanTo(-1); putDownGarbageCan(0); } else { @@ -3774,7 +3774,7 @@ void Scene18::run() { } _vm->playSoundA(); } - if (!_vm->isFlag(kGFPlatyPussDisguised)) + if (!_vm->isFlag(kGFPlatypusDisguised)) _vm->updateGnapIdleSequence(); } @@ -3814,7 +3814,7 @@ void Scene18::updateAnimations() { _vm->_gnapSequenceId = 0x1FD; } gameSys.removeSequence(0x1FA, 19, true); - _vm->setFlag(kGFPlatyPussDisguised); + _vm->setFlag(kGFPlatypusDisguised); updateHotspots(); _vm->_gnapActionStatus = -1; break; @@ -3824,7 +3824,7 @@ void Scene18::updateAnimations() { _vm->_gnapSequenceDatNum = 0; _vm->_gnapSequenceId = 0x1FE; _vm->clearFlag(kGFTruckKeysUsed); - _vm->setFlag(kGFPlatyPussDisguised); + _vm->setFlag(kGFPlatypusDisguised); updateHotspots(); _vm->_gnapActionStatus = -1; break; @@ -3916,7 +3916,7 @@ void Scene18::updateAnimations() { break; case kAS18PutGarbageCanOnRunningHydrant: _vm->setFlag(kGFTruckKeysUsed); - _vm->clearFlag(kGFPlatyPussDisguised); + _vm->clearFlag(kGFPlatypusDisguised); gameSys.requestRemoveSequence(0x211, 39); gameSys.requestRemoveSequence(0x212, 39); gameSys.insertSequence(0x210, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0); @@ -4008,7 +4008,7 @@ void Scene18::updateAnimations() { break; case kAS18PutGarbageCanOnHydrant: _vm->setFlag(kGFTruckKeysUsed); - _vm->clearFlag(kGFPlatyPussDisguised); + _vm->clearFlag(kGFPlatypusDisguised); gameSys.insertSequence(0x20F, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0); gameSys.setAnimation(0x20F, _vm->_gnapId, 0); _vm->_gnapSequenceDatNum = 0; diff --git a/engines/gnap/scenes/group2.cpp b/engines/gnap/scenes/group2.cpp index df3fbf4a83..eeffa1664e 100644 --- a/engines/gnap/scenes/group2.cpp +++ b/engines/gnap/scenes/group2.cpp @@ -1169,7 +1169,7 @@ void Scene22::run() { _vm->_gnapActionStatus = kAS22TalkCashier; break; case PLAT_CURSOR: - _vm->gnapUseDeviceOnPlatypuss(); + _vm->gnapUseDeviceOnPlatypus(); break; } } diff --git a/engines/gnap/scenes/group3.cpp b/engines/gnap/scenes/group3.cpp index 7526a9d71c..20f798c84e 100644 --- a/engines/gnap/scenes/group3.cpp +++ b/engines/gnap/scenes/group3.cpp @@ -393,7 +393,7 @@ void Scene31::run() { break; case PLAT_CURSOR: if (!_vm->invHas(kItemBucketWithBeer)) { - _vm->gnapUseDeviceOnPlatypuss(); + _vm->gnapUseDeviceOnPlatypus(); _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS31MeasuringClown].x, _vm->_hotspotsWalkPos[kHS31MeasuringClown].y + 1, 1, 0x107C2, 1); _vm->_hotspots[kHS31WalkArea1]._flags |= SF_WALKABLE; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS31MeasuringClown].x, _vm->_hotspotsWalkPos[kHS31MeasuringClown].y, 1, 0x107C2, 1); diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp index c42119cb51..b9119b72ff 100644 --- a/engines/gnap/scenes/group4.cpp +++ b/engines/gnap/scenes/group4.cpp @@ -1833,7 +1833,7 @@ void Scene44::run() { _vm->_gnapActionStatus = 1; break; case PLAT_CURSOR: - _vm->gnapUseDeviceOnPlatypuss(); + _vm->gnapUseDeviceOnPlatypus(); _vm->platypusWalkTo(6, 7, 1, 0x107D2, 1); if (_vm->_gnapX == 7 && _vm->_gnapY == 7) _vm->gnapWalkStep(); diff --git a/engines/gnap/scenes/scenecore.cpp b/engines/gnap/scenes/scenecore.cpp index eb83632d89..c6e32e07c1 100644 --- a/engines/gnap/scenes/scenecore.cpp +++ b/engines/gnap/scenes/scenecore.cpp @@ -530,7 +530,7 @@ void GnapEngine::runSceneLogic() { _scene = new Scene472(this); _scene->init(); _newSceneNum = 11; - } else if (!isFlag(kGFPlatyPussDisguised) && _prevSceneNum == 2) {//CHECKME + } else if (!isFlag(kGFPlatypusDisguised) && _prevSceneNum == 2) {//CHECKME if (isFlag(kGFUnk25)) { _scene = new Scene473(this); _scene->init(); @@ -550,7 +550,7 @@ void GnapEngine::runSceneLogic() { _scene = new Scene476(this); _scene->init(); _newSceneNum = 26; - } else if (isFlag(kGFPlatyPussDisguised) && _cursorValue == 1) { + } else if (isFlag(kGFPlatypusDisguised) && _cursorValue == 1) { _scene = new Scene477(this); _scene->init(); _newSceneNum = 4; |