aboutsummaryrefslogtreecommitdiff
path: root/engines/gnap/scenes/group3.cpp
diff options
context:
space:
mode:
authorStrangerke2016-05-05 11:58:10 +0200
committerEugene Sandulenko2016-05-10 12:14:50 +0200
commit45f27ea81c4aa3a4fbfa356a51f6b141447158d0 (patch)
tree1cb203afe1bcf09c3bb074ca081546b6cab5e912 /engines/gnap/scenes/group3.cpp
parent00c544f9f815be3121b900ff16572676ee6c4bf5 (diff)
downloadscummvm-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/group3.cpp')
-rw-r--r--engines/gnap/scenes/group3.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/engines/gnap/scenes/group3.cpp b/engines/gnap/scenes/group3.cpp
index ec17be422e..b00224ba9c 100644
--- a/engines/gnap/scenes/group3.cpp
+++ b/engines/gnap/scenes/group3.cpp
@@ -171,9 +171,9 @@ void Scene30::run() {
_vm->playSound(0x1093B, true);
if (!_vm->_isLeavingScene) {
- _vm->updatePlatypusIdleSequence();
+ _vm->_plat->updateIdleSequence();
if (_vm->_gnap->_actionStatus < 0)
- _vm->updateGnapIdleSequence();
+ _vm->_gnap->updateIdleSequence();
if (!_vm->_timers[4]) {
_vm->_timers[4] = _vm->getRandom(100) + 300;
if (_vm->_gnap->_actionStatus < 0) {
@@ -486,9 +486,9 @@ void Scene31::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(20) + 60;
if (_vm->_gnap->_actionStatus < 0 && _nextClerkSequenceId == -1) {
@@ -752,9 +752,9 @@ void Scene32::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(100) + 300;
if (_vm->getRandom(2) != 0)
@@ -983,9 +983,9 @@ void Scene33::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(100) + 300;
if (_vm->getRandom(2) != 0)
@@ -1260,8 +1260,8 @@ void Scene38::run() {
updateAnimations();
if (!_vm->_isLeavingScene) {
- _vm->updatePlatypusIdleSequence();
- _vm->updateGnapIdleSequence();
+ _vm->_plat->updateIdleSequence();
+ _vm->_gnap->updateIdleSequence();
}
_vm->checkGameKeys();
@@ -1531,9 +1531,9 @@ void Scene39::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[5]) {
_vm->_timers[5] = _vm->getRandom(20) + 50;
switch (_vm->getRandom(4)) {