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/group0.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/group0.cpp')
| -rw-r--r-- | engines/gnap/scenes/group0.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp index 9690d6932f..0ae1d2e934 100644 --- a/engines/gnap/scenes/group0.cpp +++ b/engines/gnap/scenes/group0.cpp @@ -261,9 +261,9 @@ void Scene01::run() { if (!_vm->_isLeavingScene) { if (_vm->_plat->_actionStatus < 0 && _vm->isFlag(kGFPlatypus)) - _vm->updatePlatypusIdleSequence(); + _vm->_plat->updateIdleSequence(); if (_vm->_gnap->_actionStatus < 0) - _vm->updateGnapIdleSequence(); + _vm->_gnap->updateIdleSequence(); if (_vm->_timers[4] == 0) { // Update bird animation _vm->_timers[4] = _vm->getRandom(100) + 300; @@ -673,9 +673,9 @@ void Scene02::run() { if (!_vm->_isLeavingScene) { if (_vm->_plat->_actionStatus < 0 && _vm->isFlag(kGFPlatypus)) - _vm->updatePlatypusIdleSequence(); + _vm->_plat->updateIdleSequence(); if (_vm->_gnap->_actionStatus < 0) - _vm->updateGnapIdleSequence(); + _vm->_gnap->updateIdleSequence(); if (!_vm->_timers[4]) { // Update bird animation _vm->_timers[4] = _vm->getRandom(100) + 300; @@ -1121,9 +1121,9 @@ void Scene03::run() { if (!_vm->_isLeavingScene) { if (_vm->_plat->_actionStatus < 0 && _vm->isFlag(kGFPlatypus)) - _vm->updatePlatypusIdleSequence(); + _vm->_plat->updateIdleSequence(); if (_vm->_gnap->_actionStatus < 0) - _vm->updateGnapIdleSequence(); + _vm->_gnap->updateIdleSequence(); if (!_vm->_timers[1] && !_platypusScared) { _vm->_timers[1] = _vm->getRandom(40) + 20; if (_vm->_gnap->_actionStatus < 0 && _vm->_plat->_actionStatus < 0 && !_vm->isFlag(kGFPlatypus) && !_platypusHypnotized) @@ -1664,9 +1664,9 @@ void Scene04::run() { if (!_vm->_isLeavingScene) { if (_vm->_plat->_actionStatus < 0 && _vm->isFlag(kGFPlatypus)) - _vm->updatePlatypusIdleSequence2(); + _vm->_plat->updateIdleSequence2(); if (_vm->_gnap->_actionStatus < 0) - _vm->updateGnapIdleSequence2(); + _vm->_gnap->updateIdleSequence2(); if (!_vm->_timers[5]) { _vm->_timers[5] = _vm->getRandom(150) + 300; if (_vm->_gnap->_actionStatus < 0) @@ -2107,8 +2107,8 @@ void Scene05::run() { if (!_vm->_isLeavingScene) { if (_vm->isFlag(kGFPlatypus)) - _vm->updatePlatypusIdleSequence(); - _vm->updateGnapIdleSequence(); + _vm->_plat->updateIdleSequence(); + _vm->_gnap->updateIdleSequence(); if (!_vm->_timers[5]) { _vm->_timers[5] = _vm->getRandom(20) + 30; if (_vm->_gnap->_actionStatus != kAS05TalkChicken && _nextChickenSequenceId == -1) { @@ -2501,9 +2501,9 @@ void Scene06::run() { if (!_vm->_isLeavingScene) { if (_vm->_plat->_actionStatus < 0) - _vm->updatePlatypusIdleSequence(); + _vm->_plat->updateIdleSequence(); if (_vm->_gnap->_actionStatus < 0) - _vm->updateGnapIdleSequence(); + _vm->_gnap->updateIdleSequence(); if (!_vm->_timers[4]) { _vm->_timers[4] = _vm->getRandom(40) + 25; if (_vm->_gnap->_actionStatus < 0 && _vm->_plat->_actionStatus < 0 && _nextHorseSequenceId == -1) { @@ -2801,7 +2801,7 @@ void Scene07::run() { updateAnimations(); if (!_vm->_isLeavingScene) { - _vm->updateGnapIdleSequence(); + _vm->_gnap->updateIdleSequence(); if (_vm->_plat->_actionStatus < 0 && _vm->_gnap->_actionStatus < 0) { if (_vm->_timers[0]) { if (!_vm->_timers[1]) { @@ -3190,8 +3190,8 @@ void Scene08::run() { updateAnimations(); if (!_vm->_isLeavingScene) { - _vm->updatePlatypusIdleSequence(); - _vm->updateGnapIdleSequence(); + _vm->_plat->updateIdleSequence(); + _vm->_gnap->updateIdleSequence(); if (!_vm->_timers[4]) { _vm->_timers[4] = _vm->getRandom(50) + 125; if (_vm->_gnap->_actionStatus < 0 && _vm->_plat->_actionStatus < 0 && _nextManSequenceId == -1 && @@ -3491,8 +3491,8 @@ void Scene09::run() { updateAnimations(); if (!_vm->_isLeavingScene && _vm->_gnap->_actionStatus != 1 && _vm->_gnap->_actionStatus != 2) { - _vm->updatePlatypusIdleSequence(); - _vm->updateGnapIdleSequence(); + _vm->_plat->updateIdleSequence(); + _vm->_gnap->updateIdleSequence(); if (!_vm->_timers[4]) { _vm->_timers[4] = _vm->getRandom(150) + 100; if (_vm->_timers[4] & 1) |