GNAP: Refactoring of playMoan1&2, playPullOutDevice and playPullOutDeviceNonWorking

5 files changed, 80 insertions, 80 deletions

diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp
index b282751b3d..a0bdba220c 100644
--- a/engines/gnap/scenes/group0.cpp
+++ b/engines/gnap/scenes/group0.cpp
@@ -133,7 +133,7 @@ void Scene01::run() {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
 						if (_vm->isFlag(kGFKeysTaken))
-							gnap.playMoan1(plat._pos.x, plat._pos.y);
+							gnap.playMoan1(plat._pos);
 						else
 							gnap.playScratchingHead(plat._pos.x, plat._pos.y);
 						break;
@@ -315,7 +315,7 @@ void Scene01::updateAnimations() {
 			break;
 
 		case kAS01TakeMud:
-			gnap.playPullOutDevice(2, 3);
+			gnap.playPullOutDevice(Common::Point(2, 3));
 			gnap.playUseDevice(0, 0);
 			gameSys.insertSequence(128, 40, 129, 40, kSeqSyncWait, 0, 0, 0);
 			gameSys.setAnimation(128, 40, 3);
@@ -330,7 +330,7 @@ void Scene01::updateAnimations() {
 			break;
 
 		case kAS01UsePigs:
-			gnap.playPullOutDevice(7, 2);
+			gnap.playPullOutDevice(Common::Point(7, 2));
 			gnap.playUseDevice(0, 0);
 			gameSys.insertSequence(135, 39, 0, 0, kSeqNone, 25, _vm->getRandom(140) - 40, 0);
 			gnap._actionStatus = -1;
@@ -486,7 +486,7 @@ void Scene02::run() {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
 						if (_vm->isFlag(kGFKeysTaken))
-							gnap.playMoan1(plat._pos.x, plat._pos.y);
+							gnap.playMoan1(plat._pos);
 						else
 							gnap.playScratchingHead(plat._pos.x, plat._pos.y);
 						break;
@@ -517,7 +517,7 @@ void Scene02::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playMoan2(9, 8);
+						gnap.playMoan2(Common::Point(9, 8));
 						break;
 					case GRAB_CURSOR:
 						gnap._idleFacing = kDirBottomRight;
@@ -593,7 +593,7 @@ void Scene02::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playMoan2(2, 4);
+						gnap.playMoan2(Common::Point(2, 4));
 						break;
 					case GRAB_CURSOR:
 						gnap._idleFacing = kDirUpRight;
@@ -954,7 +954,7 @@ void Scene03::run() {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
 						if (_vm->isFlag(kGFKeysTaken))
-							gnap.playMoan1(plat._pos.x, plat._pos.y);
+							gnap.playMoan1(plat._pos);
 						else
 							gnap.playScratchingHead(plat._pos.x, plat._pos.y);
 						break;
@@ -985,7 +985,7 @@ void Scene03::run() {
 						gnap.playScratchingHead(9, 6);
 						break;
 					case GRAB_CURSOR:
-						gnap.playPullOutDevice(9, 6);
+						gnap.playPullOutDevice(Common::Point(9, 6));
 						gnap.playUseDevice(0, 0);
 						gameSys.insertSequence(0x1B3, 253, 0x1B2, 253, kSeqSyncWait, 0, 0, 0);
 						gameSys.setAnimation(0x1B3, 253, 5);
@@ -1023,7 +1023,7 @@ void Scene03::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playMoan2(2, 8);
+						gnap.playMoan2(Common::Point(2, 8));
 						break;
 					case GRAB_CURSOR:
 						if (!_vm->isFlag(kGFPlatypus))
@@ -1462,7 +1462,7 @@ void Scene04::run() {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
 						if (_vm->isFlag(kGFKeysTaken))
-							gnap.playMoan1(plat._pos.x, plat._pos.y);
+							gnap.playMoan1(plat._pos);
 						else
 							gnap.playScratchingHead(plat._pos.x, plat._pos.y);
 						break;
@@ -1470,7 +1470,7 @@ void Scene04::run() {
 						if (_vm->_cursorValue == 4)
 							gnap.kissPlatypus(0);
 						else
-							gnap.playMoan1(plat._pos.x, plat._pos.y);
+							gnap.playMoan1(plat._pos);
 						break;
 					case TALK_CURSOR:
 						gnap.playBrainPulsating(plat._pos);
@@ -1494,7 +1494,7 @@ void Scene04::run() {
 						gnap.playScratchingHead(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
 						break;
 					case GRAB_CURSOR:
-						gnap.playPullOutDevice(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
+						gnap.playPullOutDevice(_vm->_hotspotsWalkPos[1]);
 						gnap.playUseDevice(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
 						gameSys.insertSequence(0x1FD, 100, 510, 100, kSeqSyncWait, 0, 0, 0);
 						gameSys.setAnimation(0x1FD, 100, 2);
@@ -1515,7 +1515,7 @@ void Scene04::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playMoan2(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y);
+						gnap.playMoan2(_vm->_hotspotsWalkPos[3]);
 						break;
 					case GRAB_CURSOR:
 						gnap._idleFacing = kDirUpRight;
@@ -1541,7 +1541,7 @@ void Scene04::run() {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
 						if (gnap.walkTo(gnap._pos, 0, -1, 1)) {
-							gnap.playMoan2(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y);
+							gnap.playMoan2(_vm->_hotspotsWalkPos[2]);
 							_nextDogSequenceId = 0x20F;
 						}
 						break;
@@ -1940,7 +1940,7 @@ void Scene05::run() {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
 						if (_vm->isFlag(kGFKeysTaken))
-							gnap.playMoan1(plat._pos.x, plat._pos.y);
+							gnap.playMoan1(plat._pos);
 						else
 							gnap.playScratchingHead(plat._pos.x, plat._pos.y);
 						break;
@@ -2003,7 +2003,7 @@ void Scene05::run() {
 				else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playMoan2(9, 7);
+						gnap.playMoan2(Common::Point(9, 7));
 						break;
 					case GRAB_CURSOR:
 						gnap._idleFacing = kDirBottomRight;
@@ -2030,7 +2030,7 @@ void Scene05::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playMoan2(2, 4);
+						gnap.playMoan2(Common::Point(2, 4));
 						break;
 					case GRAB_CURSOR:
 						gnap._idleFacing = kDirBottomLeft;
@@ -2369,7 +2369,7 @@ void Scene06::run() {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
 						if (_vm->isFlag(kGFKeysTaken))
-							gnap.playMoan1(plat._pos.x, plat._pos.y);
+							gnap.playMoan1(plat._pos);
 						else
 							gnap.playScratchingHead(plat._pos.x, plat._pos.y);
 						break;
@@ -2407,7 +2407,7 @@ void Scene06::run() {
 							gnap._actionStatus = kAS06TryToGetGas;
 						} else {
 							triedDeviceOnGas = true;
-							gnap.playPullOutDeviceNonWorking(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
+							gnap.playPullOutDeviceNonWorking(_vm->_hotspotsWalkPos[1]);
 						}
 						break;
 					case TALK_CURSOR:
@@ -2746,7 +2746,7 @@ void Scene07::run() {
 		case kHS07Platypus:
 			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);
@@ -2780,7 +2780,7 @@ void Scene07::run() {
 					_vm->setFlag(kGFPlatypus);
 					_vm->invAdd(kItemDice);
 					updateHotspots();
-					gnap.playPullOutDevice(3, 3);
+					gnap.playPullOutDevice(Common::Point(3, 3));
 					gameSys.setAnimation(0x8E, 1, 2);
 					gameSys.insertSequence(0x8E, 1, 141, 1, kSeqSyncWait, 0, 0, 0);
 					gameSys.insertSequence(gnap.getSequenceId(gskUseDevice, Common::Point(0, 0)) | 0x10000, gnap._id,
@@ -3017,7 +3017,7 @@ void Scene08::run() {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
 					if (_vm->isFlag(kGFSceneFlag1))
-						gnap.playMoan1(plat._pos.x, plat._pos.y);
+						gnap.playMoan1(plat._pos);
 					else
 						gnap.playScratchingHead(plat._pos.x, plat._pos.y);
 					break;
@@ -3134,7 +3134,7 @@ void Scene08::run() {
 						gnap.playScratchingHead(6, 7);
 					} else {
 						gnap.actionIdle(0x14D);
-						gnap.playPullOutDevice(6, 7);
+						gnap.playPullOutDevice(Common::Point(6, 7));
 						gnap.playUseDevice(0, 0);
 						_nextDogSequenceId = 0x149;
 					}
@@ -3160,7 +3160,7 @@ void Scene08::run() {
 						gnap.playScratchingHead(3, 6);
 					} else {
 						gnap.actionIdle(0x14D);
-						gnap.playPullOutDevice(3, 6);
+						gnap.playPullOutDevice(Common::Point(3, 6));
 						gnap.playUseDevice(0, 0);
 						_nextDogSequenceId = 0x14A;
 					}
@@ -3186,7 +3186,7 @@ void Scene08::run() {
 						gnap.playScratchingHead(7, 6);
 					} else {
 						gnap.actionIdle(0x14D);
-						gnap.playPullOutDevice(7, 6);
+						gnap.playPullOutDevice(Common::Point(7, 6));
 						gnap.playUseDevice(0, 0);
 						_nextDogSequenceId = 0x14B;
 					}
@@ -3453,7 +3453,7 @@ void Scene09::run() {
 		case kHS09Platypus:
 			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);
diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp
index db244f2feb..0560cfd666 100644
--- a/engines/gnap/scenes/group1.cpp
+++ b/engines/gnap/scenes/group1.cpp
@@ -114,7 +114,7 @@ void Scene10::run() {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
 					if (_vm->isFlag(kGFMudTaken))
-						gnap.playMoan1(plat._pos.x, plat._pos.y);
+						gnap.playMoan1(plat._pos);
 					else
 						gnap.playScratchingHead(plat._pos.x, plat._pos.y);
 					break;
@@ -187,13 +187,13 @@ void Scene10::run() {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
 					if (_vm->isFlag(kGFMudTaken))
-						gnap.playMoan2(-1, -1);
+						gnap.playMoan2(Common::Point(-1, -1));
 					else
 						gnap.playScratchingHead(4, 3);
 					break;
 				case GRAB_CURSOR:
 					if (_vm->isFlag(kGFMudTaken))
-						gnap.playMoan2(-1, -1);
+						gnap.playMoan2(Common::Point(-1, -1));
 					else {
 						gnap.actionIdle(0x10C);
 						gnap.walkTo(Common::Point(4, 8), 0, 0x107BB, 1);
@@ -205,7 +205,7 @@ void Scene10::run() {
 					break;
 				case PLAT_CURSOR:
 					if (_vm->isFlag(kGFMudTaken))
-						gnap.playMoan2(-1, -1);
+						gnap.playMoan2(Common::Point(-1, -1));
 					else {
 						gnap.actionIdle(0x10C);
 						gnap.useDeviceOnPlatypus();
@@ -236,7 +236,7 @@ void Scene10::run() {
 					break;
 				case PLAT_CURSOR:
 					if (_vm->isFlag(kGFMudTaken))
-						gnap.playMoan2(-1, -1);
+						gnap.playMoan2(Common::Point(-1, -1));
 					else {
 						_vm->invAdd(kItemTongs);
 						_vm->setFlag(kGFMudTaken);
@@ -611,7 +611,7 @@ void Scene11::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);
@@ -1034,7 +1034,7 @@ void Scene12::run() {
 		case kHS12Platypus:
 			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);
@@ -1126,7 +1126,7 @@ void Scene12::run() {
 					gnap._actionStatus = kAS12TalkBarkeeper;
 					break;
 				case PLAT_CURSOR:
-					gnap.playPullOutDevice(plat._pos.x, plat._pos.y);
+					gnap.playPullOutDevice(plat._pos);
 					gameSys.setAnimation(makeRid(gnap._sequenceDatNum, gnap._sequenceId), gnap._id, 0);
 					gnap._actionStatus = kAS12PlatWithBarkeeper;
 					break;
@@ -1547,7 +1547,7 @@ void Scene13::run() {
 		case kHS13Platypus:
 			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);
@@ -2862,7 +2862,7 @@ void Scene17::updateAnimations() {
 			gnap._actionStatus = kAS17GetWrenchGnapReady;
 			break;
 		case kAS17GetCoinFromPhone:
-			gnap.playPullOutDevice(1, 3);
+			gnap.playPullOutDevice(Common::Point(1, 3));
 			gnap.playUseDevice(0, 0);
 			gameSys.setAnimation(0x250, 100, 0);
 			gameSys.insertSequence(0x250, 100, 591, 100, kSeqSyncWait, 0, 0, 0);
@@ -3486,7 +3486,7 @@ void Scene18::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);
@@ -3881,7 +3881,7 @@ void Scene18::updateAnimations() {
 		case kAS18OpenTopValve:
 			_vm->setFlag(kGFBarnPadlockOpen);
 			updateHotspots();
-			gnap.playPullOutDevice(2, 7);
+			gnap.playPullOutDevice(Common::Point(2, 7));
 			gnap.playUseDevice(0, 0);
 			gameSys.insertSequence(0x20C, 19, 0, 0, kSeqNone, 0, 0, 0);
 			_vm->_hotspots[kHS18WalkArea2]._flags |= SF_WALKABLE;
@@ -3979,7 +3979,7 @@ void Scene18::updateAnimations() {
 		case kAS18OpenRightValveWithGarbageCan:
 			_vm->setFlag(kGFTruckFilledWithGas);
 			updateHotspots();
-			gnap.playPullOutDevice(2, 7);
+			gnap.playPullOutDevice(Common::Point(2, 7));
 			gnap.playUseDevice(0, 0);
 			gameSys.insertSequence(0x20B, 19, 0, 0, kSeqNone, 0, 0, 0);
 			_vm->_hotspots[kHS18WalkArea2]._flags |= SF_WALKABLE;
@@ -4195,7 +4195,7 @@ void Scene19::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);
@@ -4287,7 +4287,7 @@ void Scene19::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playMoan2(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y);
+						gnap.playMoan2(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot]);
 						break;
 					case GRAB_CURSOR:
 						gnap.walkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 0, -1, 1);
@@ -4402,7 +4402,7 @@ void Scene19::updateAnimations() {
 			}
 			break;
 		case kAS19GrabPicture:
-			gnap.playPullOutDevice(6, 2);
+			gnap.playPullOutDevice(Common::Point(6, 2));
 			gnap.playUseDevice(0, 0);
 			gameSys.setAnimation(0x68, 19, 0);
 			gameSys.insertSequence(0x68, 19, 105, 19, kSeqSyncWait, 0, 0, 0);
diff --git a/engines/gnap/scenes/group2.cpp b/engines/gnap/scenes/group2.cpp
index 33322cc70b..e832f35173 100644
--- a/engines/gnap/scenes/group2.cpp
+++ b/engines/gnap/scenes/group2.cpp
@@ -69,7 +69,7 @@ void Scene20::updateAnimationsCb() {
 			break;
 		case 0x16A:
 			// Grab joint
-			gnap.playPullOutDevice(4, 4);
+			gnap.playPullOutDevice(Common::Point(4, 4));
 			gnap.playUseDevice(0, 0);
 			gameSys.setAnimation(0x16A, 21, 0);
 			gameSys.insertSequence(0x16A, 21, _currStonerGuySequenceId, 21, kSeqSyncWait, 0, 0, 0);
@@ -370,7 +370,7 @@ void Scene20::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playMoan2(5, 4);
+						gnap.playMoan2(Common::Point(5, 4));
 						break;
 					case GRAB_CURSOR:
 						gnap._idleFacing = kDirUpRight;
@@ -831,7 +831,7 @@ void Scene21::run() {
 						break;
 					case GRAB_CURSOR:
 						gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(gskIdle, _vm->_hotspotsWalkPos[kHS21Banana]) | 0x10000, 1);
-						gnap.playPullOutDevice(2, 5);
+						gnap.playPullOutDevice(Common::Point(2, 5));
 						gnap.playUseDevice(0, 0);
 						gnap._actionStatus = kAS21GrabBanana;
 						break;
@@ -1373,7 +1373,7 @@ void Scene23::run() {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
 						if (_vm->isFlag(kGFSceneFlag1))
-							gnap.playMoan2(0, 0);
+							gnap.playMoan2();
 						else {
 							gnap.walkTo(_vm->_hotspotsWalkPos[kHS23Cereals], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1);
 							gnap._actionStatus = kAS23LookCereals;
@@ -1890,7 +1890,7 @@ void Scene25::run() {
 				if (_vm->_grabCursorSpriteIndex == kItemTickets) {
 					gnap._actionStatus = kAS25ShowTicketToVendor;
 					gnap.walkTo(_vm->_hotspotsWalkPos[kHS25TicketVendor], 0, gnap.getSequenceId(gskIdle, Common::Point(9, 4)) | 0x10000, 1);
-					gnap.playPullOutDevice(0, 0);
+					gnap.playPullOutDevice();
 					gnap.playUseDevice(0, 0);
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
 					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS25TicketVendor].x, _vm->_hotspotsWalkPos[kHS25TicketVendor].y, 6, 1);
@@ -1967,7 +1967,7 @@ void Scene25::run() {
 					case GRAB_CURSOR:
 					case TALK_CURSOR:
 					case PLAT_CURSOR:
-						gnap.playMoan2(0, 0);
+						gnap.playMoan2();
 						break;
 					}
 				}
@@ -2187,7 +2187,7 @@ void Scene26::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);
@@ -2424,7 +2424,7 @@ void Scene27::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);
@@ -2613,7 +2613,7 @@ void Scene27::updateAnimations() {
 			}
 			break;
 		case kAS27GrabBucket:
-			gnap.playPullOutDevice(0, 0);
+			gnap.playPullOutDevice();
 			gnap.playUseDevice(0, 0);
 			_vm->_hotspots[kHS27Bucket]._flags = SF_DISABLED;
 			_vm->invAdd(kItemEmptyBucket);
@@ -2675,7 +2675,7 @@ void Scene27::updateAnimations() {
 			break;
 		case 0xD0:
 			// Show picture to janitor
-			gnap.playPullOutDevice(0, 0);
+			gnap.playPullOutDevice();
 			gnap.playUseDevice(0, 0);
 			gameSys.insertSequence(_nextJanitorSequenceId, 39, _currJanitorSequenceId, 39, kSeqSyncWait, 0, 0, 0);
 			gameSys.setAnimation(_nextJanitorSequenceId, 39, 0);
@@ -2798,7 +2798,7 @@ void Scene28::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);
@@ -2858,13 +2858,13 @@ void Scene28::run() {
 				} else if (_vm->_grabCursorSpriteIndex == kItemBucketWithBeer) {
 					gnap._idleFacing = kDirUpLeft;
 					gnap.walkTo(_vm->_hotspotsWalkPos[kHS28Clown], 0, 0x107BC, 1);
-					gnap.playPullOutDevice(0, 0);
+					gnap.playPullOutDevice();
 					gnap.playUseDevice(0, 0);
 					gnap._actionStatus = kAS28UseBeerBucketWithClown;
 				} else if (_vm->_grabCursorSpriteIndex == kItemBucketWithPill) {
 					gnap._idleFacing = kDirUpLeft;
 					gnap.walkTo(_vm->_hotspotsWalkPos[kHS28Clown], 0, 0x107BC, 1);
-					gnap.playPullOutDevice(0, 0);
+					gnap.playPullOutDevice();
 					gnap.playUseDevice(0, 0);
 					gnap._actionStatus = kAS28UsePillBucketWithClown;
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -2989,7 +2989,7 @@ void Scene28::updateAnimations() {
 			_nextClownSequenceId = 0x119;
 			break;
 		case kAS28GrabHornSuccess:
-			gnap.playPullOutDevice(0, 0);
+			gnap.playPullOutDevice();
 			gnap.playUseDevice(0, 0);
 			gameSys.setAnimation(0x117, 59, 0);
 			gameSys.insertSequence(0x117, 59, 280, 59, kSeqSyncWait, 0, 0, 0);
@@ -3011,7 +3011,7 @@ void Scene28::updateAnimations() {
 			gnap._actionStatus = -1;
 			break;
 		case kAS28GrabEmptyBucket:
-			gnap.playPullOutDevice(0, 0);
+			gnap.playPullOutDevice();
 			gnap.playUseDevice(0, 0);
 			gameSys.setAnimation(0x111, 99, 0);
 			gameSys.insertSequence(0x111, 99, 274, 99, kSeqSyncWait, 0, 0, 0);
@@ -3192,7 +3192,7 @@ void Scene29::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);
@@ -3271,7 +3271,7 @@ void Scene29::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playMoan2(0, 0);
+						gnap.playMoan2();
 						break;
 					case GRAB_CURSOR:
 					case TALK_CURSOR:
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);
diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp
index 4f072793d4..b789b0e1f3 100644
--- a/engines/gnap/scenes/group4.cpp
+++ b/engines/gnap/scenes/group4.cpp
@@ -83,7 +83,7 @@ void Scene40::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);
@@ -361,7 +361,7 @@ void Scene41::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);
@@ -411,7 +411,7 @@ void Scene41::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playMoan1(5, 0);
+						gnap.playMoan1(Common::Point(5, 0));
 						break;
 					case GRAB_CURSOR:
 						gnap.playImpossible();
@@ -458,7 +458,7 @@ void Scene41::run() {
 
 			case kHS41ToyUfo:
 				if (_vm->_grabCursorSpriteIndex == kItemGum) {
-					gnap.playPullOutDevice(9, 0);
+					gnap.playPullOutDevice(Common::Point(9, 0));
 					gameSys.setAnimation(makeRid(gnap._sequenceDatNum, gnap._sequenceId), gnap._id, 0);
 					gnap._actionStatus = kAS41UseGumWithToyUfo;
 				}
@@ -876,7 +876,7 @@ void Scene42::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);
@@ -1337,7 +1337,7 @@ void Scene43::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);
@@ -1788,7 +1788,7 @@ void Scene44::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);
@@ -1866,7 +1866,7 @@ void Scene44::run() {
 						gnap.playScratchingHead(8, 7);
 						break;
 					case GRAB_CURSOR:
-						gnap.playPullOutDevice(8, 0);
+						gnap.playPullOutDevice(Common::Point(8, 0));
 						gnap.playUseDevice(8, 0);
 						_nextSpringGuySequenceId = 0xFB;
 						_vm->invAdd(kItemSpring);
@@ -1890,7 +1890,7 @@ void Scene44::run() {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
 						if (_vm->isFlag(kGFSpringTaken))
-							gnap.playMoan1(8, 7);
+							gnap.playMoan1(Common::Point(8, 7));
 						else
 							gnap.playScratchingHead(8, 7);
 						break;
@@ -2281,7 +2281,7 @@ void Scene45::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);
@@ -2610,7 +2610,7 @@ void Scene46::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);
@@ -2633,7 +2633,7 @@ void Scene46::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playMoan1(_vm->_hotspotsWalkPos[kHS46SackGuy].x + 1, 0);
+						gnap.playMoan1(Common::Point(_vm->_hotspotsWalkPos[kHS46SackGuy].x + 1, 0));
 						break;
 					case TALK_CURSOR:
 						gnap._idleFacing = kDirUpLeft;
@@ -2654,7 +2654,7 @@ void Scene46::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playMoan1(_vm->_hotspotsWalkPos[kHS46ItchyGuy].x - 1, 0);
+						gnap.playMoan1(Common::Point(_vm->_hotspotsWalkPos[kHS46ItchyGuy].x - 1, 0));
 						break;
 					case TALK_CURSOR:
 						gnap._idleFacing = kDirUpRight;