diff options
| author | Strangerke | 2016-05-05 11:58:10 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-05-10 12:14:50 +0200 |
| commit | 45f27ea81c4aa3a4fbfa356a51f6b141447158d0 (patch) | |
| tree | 1cb203afe1bcf09c3bb074ca081546b6cab5e912 /engines/gnap/scenes/group4.cpp | |
| parent | 00c544f9f815be3121b900ff16572676ee6c4bf5 (diff) | |
| download | scummvm-rg350-45f27ea81c4aa3a4fbfa356a51f6b141447158d0.tar.gz scummvm-rg350-45f27ea81c4aa3a4fbfa356a51f6b141447158d0.tar.bz2 scummvm-rg350-45f27ea81c4aa3a4fbfa356a51f6b141447158d0.zip | |
GNAP: Even more refactoring related to characters (WIP)
Diffstat (limited to 'engines/gnap/scenes/group4.cpp')
| -rw-r--r-- | engines/gnap/scenes/group4.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp index 9d731c0b9f..6ec914db59 100644 --- a/engines/gnap/scenes/group4.cpp +++ b/engines/gnap/scenes/group4.cpp @@ -511,9 +511,9 @@ void Scene41::run() { if (!_vm->_isLeavingScene) { if (_vm->_plat->_actionStatus < 0) - _vm->updatePlatypusIdleSequence(); + _vm->_plat->updateIdleSequence(); if (_vm->_gnap->_actionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO)) - _vm->updateGnapIdleSequence(); + _vm->_gnap->updateIdleSequence(); if (!_vm->_timers[4]) { _vm->_timers[4] = _vm->getRandom(100) + 100; if (_vm->_gnap->_actionStatus < 0 && _vm->_plat->_actionStatus < 0 && _vm->_toyUfoActionStatus == -1 && _nextToyVendorSequenceId == -1) { @@ -979,9 +979,9 @@ void Scene42::run() { if (!_vm->_isLeavingScene) { if (_vm->_plat->_actionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO)) - _vm->updatePlatypusIdleSequence(); + _vm->_plat->updateIdleSequence(); if (_vm->_gnap->_actionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO)) - _vm->updateGnapIdleSequence(); + _vm->_gnap->updateIdleSequence(); if (!_vm->_timers[4]) { _vm->_timers[4] = _vm->getRandom(20) + 30; if (_vm->_gnap->_actionStatus < 0 && _vm->_plat->_actionStatus < 0 && _nextBBQVendorSequenceId == -1) { @@ -1433,9 +1433,9 @@ void Scene43::run() { if (!_vm->_isLeavingScene) { if (_vm->_plat->_actionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO)) - _vm->updatePlatypusIdleSequence(); + _vm->_plat->updateIdleSequence(); if (_vm->_gnap->_actionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO)) - _vm->updateGnapIdleSequence(); + _vm->_gnap->updateIdleSequence(); if (!_vm->_timers[4] && (!_vm->isFlag(kGFGnapControlsToyUFO) || !_vm->isFlag(kGFGroceryStoreHatTaken))) { _vm->_timers[4] = _vm->getRandom(100) + 100; if (_vm->_gnap->_actionStatus < 0 && _vm->_plat->_actionStatus < 0 && _nextTwoHeadedGuySequenceId == -1) { @@ -1915,9 +1915,9 @@ void Scene44::run() { if (!_vm->_isLeavingScene) { if (_vm->_plat->_actionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO) && _currKissingLadySequenceId != 0xF5) - _vm->updatePlatypusIdleSequence(); + _vm->_plat->updateIdleSequence(); if (_vm->_gnap->_actionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO)) - _vm->updateGnapIdleSequence(); + _vm->_gnap->updateIdleSequence(); if (!_vm->_timers[4]) { _vm->_timers[4] = _vm->getRandom(20) + 20; if (_vm->_gnap->_actionStatus < 0 && _vm->_plat->_actionStatus < 0 && _nextKissingLadySequenceId == -1) { @@ -2362,7 +2362,7 @@ void Scene45::run() { _vm->toyUfoCheckTimer(); if (!_vm->_isLeavingScene && _vm->_gnap->_actionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO)) - _vm->updateGnapIdleSequence(); + _vm->_gnap->updateIdleSequence(); _vm->checkGameKeys(); @@ -2691,9 +2691,9 @@ void Scene46::run() { if (!_vm->_isLeavingScene) { if (_vm->_plat->_actionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO)) - _vm->updatePlatypusIdleSequence(); + _vm->_plat->updateIdleSequence(); if (_vm->_gnap->_actionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO)) - _vm->updateGnapIdleSequence(); + _vm->_gnap->updateIdleSequence(); if (!_vm->_timers[4]) { _vm->_timers[4] = _vm->getRandom(50) + 80; if (_vm->_gnap->_actionStatus < 0 && _vm->_plat->_actionStatus < 0 && _nextItchyGuySequenceId == -1) { |