diff options
| author | Strangerke | 2016-05-08 20:44:35 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-05-10 12:14:56 +0200 |
| commit | cf32e654a712915ee9d40c6595e0f30911833479 (patch) | |
| tree | 144a75155cb365eb5015ce4e1c7e49f0798d1fd7 /engines/gnap/scenes/group3.cpp | |
| parent | a67a9923a928965feb33e86b2c9cb0f18af25ae5 (diff) | |
| download | scummvm-rg350-cf32e654a712915ee9d40c6595e0f30911833479.tar.gz scummvm-rg350-cf32e654a712915ee9d40c6595e0f30911833479.tar.bz2 scummvm-rg350-cf32e654a712915ee9d40c6595e0f30911833479.zip | |
GNAP: Refactoring of playMoan1&2, playPullOutDevice and playPullOutDeviceNonWorking
Diffstat (limited to 'engines/gnap/scenes/group3.cpp')
| -rw-r--r-- | engines/gnap/scenes/group3.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/gnap/scenes/group3.cpp b/engines/gnap/scenes/group3.cpp index c650ec75ca..c29e7c176d 100644 --- a/engines/gnap/scenes/group3.cpp +++ b/engines/gnap/scenes/group3.cpp @@ -97,7 +97,7 @@ void Scene30::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - gnap.playMoan1(plat._pos.x, plat._pos.y); + gnap.playMoan1(plat._pos); break; case GRAB_CURSOR: gnap.kissPlatypus(0); @@ -355,7 +355,7 @@ void Scene31::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - gnap.playMoan1(plat._pos.x, plat._pos.y); + gnap.playMoan1(plat._pos); break; case GRAB_CURSOR: gnap.kissPlatypus(0); @@ -422,7 +422,7 @@ void Scene31::run() { gnap.walkTo(gnap._pos, -1, gnap.getSequenceId(gskIdle, _vm->_hotspotsWalkPos[kHS31BeerBarrel]) | 0x10000, 1); _clerkMeasureMaxCtr += 5; gameSys.insertSequence(0xF8, 59, 0, 0, kSeqNone, 0, 0, 0); - gnap.playPullOutDevice(6, 8); + gnap.playPullOutDevice(Common::Point(6, 8)); gnap.playUseDevice(0, 0); gnap.walkTo(_vm->_hotspotsWalkPos[kHS31BeerBarrel], 0, 0x107BC, 1); gnap._actionStatus = kAS31FillEmptyBucketWithBeer; @@ -560,7 +560,7 @@ void Scene31::updateAnimations() { break; case kAS31FillEmptyBucketWithBeerDone: gnap._idleFacing = kDirBottomLeft; - gnap.playPullOutDevice(0, 0); + gnap.playPullOutDevice(); gnap.playUseDevice(0, 0); gameSys.insertSequence(0xF9, 59, 0xF8, 59, kSeqSyncWait, 0, 0, 0); gnap._actionStatus = -1; @@ -708,7 +708,7 @@ void Scene32::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - gnap.playMoan1(plat._pos.x, plat._pos.y); + gnap.playMoan1(plat._pos); break; case GRAB_CURSOR: gnap.kissPlatypus(0); @@ -886,7 +886,7 @@ void Scene33::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - gnap.playMoan1(plat._pos.x, plat._pos.y); + gnap.playMoan1(plat._pos); break; case GRAB_CURSOR: gnap.kissPlatypus(0); @@ -1170,7 +1170,7 @@ void Scene38::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - gnap.playMoan1(plat._pos.x, plat._pos.y); + gnap.playMoan1(plat._pos); break; case GRAB_CURSOR: gnap.kissPlatypus(0); @@ -1480,7 +1480,7 @@ void Scene39::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - gnap.playMoan1(plat._pos.x, plat._pos.y); + gnap.playMoan1(plat._pos); break; case GRAB_CURSOR: gnap.kissPlatypus(0); |