GNAP: Refactoring of playScratchingHead, playShowCurrItem, playUseDevice

7 files changed, 196 insertions, 194 deletions

diff --git a/engines/gnap/character.cpp b/engines/gnap/character.cpp
index c8ad1867cf..5226c75210 100644
--- a/engines/gnap/character.cpp
+++ b/engines/gnap/character.cpp
@@ -1061,8 +1061,8 @@ void PlayerGnap::playImpossible(Common::Point gridPos) {
 	playSequence(getSequenceId(gskImpossible, gridPos) | 0x10000);
 }
 
-void PlayerGnap::playScratchingHead(int gridX, int gridY) {
-	playSequence(getSequenceId(gskScratchingHead, Common::Point(gridX, gridY)) | 0x10000);
+void PlayerGnap::playScratchingHead(Common::Point gridPos) {
+	playSequence(getSequenceId(gskScratchingHead, gridPos) | 0x10000);
 }
 
 void PlayerGnap::playMoan1(Common::Point gridPos) {
@@ -1085,8 +1085,8 @@ void PlayerGnap::playPullOutDeviceNonWorking(Common::Point gridPos) {
 	playSequence(getSequenceId(gskPullOutDeviceNonWorking, gridPos) | 0x10000);
 }
 
-void PlayerGnap::playUseDevice(int gridX, int gridY) {
-	playSequence(getSequenceId(gskUseDevice, Common::Point(gridX, gridY)) | 0x10000);
+void PlayerGnap::playUseDevice(Common::Point gridPos) {
+	playSequence(getSequenceId(gskUseDevice, gridPos) | 0x10000);
 }
 
 void PlayerGnap::playIdle(Common::Point gridPos) {
@@ -1097,12 +1097,12 @@ void PlayerGnap::playShowItem(int itemIndex, int gridLookX, int gridLookY) {
 	playSequence(getShowSequenceId(itemIndex, gridLookX, gridLookY) | 0x10000);
 }
 
-void PlayerGnap::playShowCurrItem(int gridX, int gridY, int gridLookX, int gridLookY) {
+void PlayerGnap::playShowCurrItem(Common::Point destPos, int gridLookX, int gridLookY) {
 	PlayerPlat& plat = *_vm->_plat;
 
-	if (plat._pos.x == gridX && plat._pos.y == gridY)
+	if (plat._pos == destPos)
 		plat.makeRoom();
-	walkTo(Common::Point(gridX, gridY), -1, -1, 1);
+	walkTo(destPos, -1, -1, 1);
 	playShowItem(_vm->_grabCursorSpriteIndex, gridLookX, gridLookY);
 }
 
diff --git a/engines/gnap/character.h b/engines/gnap/character.h
index 4494aa8461..554e980dbb 100644
--- a/engines/gnap/character.h
+++ b/engines/gnap/character.h
@@ -103,10 +103,10 @@ public:
 	void playMoan2(Common::Point gridPos = Common::Point(0, 0));
 	void playPullOutDevice(Common::Point gridPos = Common::Point(0, 0));
 	void playPullOutDeviceNonWorking(Common::Point gridPos = Common::Point(0, 0));
-	void playScratchingHead(int gridX, int gridY);
-	void playShowCurrItem(int gridX, int gridY, int gridLookX, int gridLookY);
+	void playScratchingHead(Common::Point gridPos = Common::Point(0, 0));
+	void playShowCurrItem(Common::Point destPos, int gridLookX, int gridLookY);
 	void playShowItem(int itemIndex, int gridLookX, int gridLookY);
-	void playUseDevice(int gridX, int gridY);
+	void playUseDevice(Common::Point gridPos = Common::Point(0, 0));
 	void useDeviceOnPlatypus();
 	void useDisguiseOnPlatypus();
 	void useJointOnPlatypus();
diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp
index a0bdba220c..b0acf8f5bb 100644
--- a/engines/gnap/scenes/group0.cpp
+++ b/engines/gnap/scenes/group0.cpp
@@ -135,7 +135,7 @@ void Scene01::run() {
 						if (_vm->isFlag(kGFKeysTaken))
 							gnap.playMoan1(plat._pos);
 						else
-							gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+							gnap.playScratchingHead(plat._pos);
 						break;
 					case GRAB_CURSOR:
 						gnap.kissPlatypus(0);
@@ -155,7 +155,7 @@ void Scene01::run() {
 		case kHS01Spaceship:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 2);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[4], 0, 2);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
@@ -176,11 +176,11 @@ void Scene01::run() {
 		case kHS01Mud:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 2, 3);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[2], 2, 3);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(3, 3);
+						gnap.playScratchingHead(Common::Point(3, 3));
 						break;
 					case GRAB_CURSOR:
 						gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, gnap.getSequenceId(gskIdle, Common::Point(2, 3)) | 0x10000, 1);
@@ -198,7 +198,7 @@ void Scene01::run() {
 		case kHS01Pigs:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 7, 2);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[3], 7, 2);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
@@ -316,7 +316,7 @@ void Scene01::updateAnimations() {
 
 		case kAS01TakeMud:
 			gnap.playPullOutDevice(Common::Point(2, 3));
-			gnap.playUseDevice(0, 0);
+			gnap.playUseDevice();
 			gameSys.insertSequence(128, 40, 129, 40, kSeqSyncWait, 0, 0, 0);
 			gameSys.setAnimation(128, 40, 3);
 			gnap._actionStatus = -1;
@@ -331,7 +331,7 @@ void Scene01::updateAnimations() {
 
 		case kAS01UsePigs:
 			gnap.playPullOutDevice(Common::Point(7, 2));
-			gnap.playUseDevice(0, 0);
+			gnap.playUseDevice();
 			gameSys.insertSequence(135, 39, 0, 0, kSeqNone, 25, _vm->getRandom(140) - 40, 0);
 			gnap._actionStatus = -1;
 			break;
@@ -488,7 +488,7 @@ void Scene02::run() {
 						if (_vm->isFlag(kGFKeysTaken))
 							gnap.playMoan1(plat._pos);
 						else
-							gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+							gnap.playScratchingHead(plat._pos);
 						break;
 					case GRAB_CURSOR:
 						gnap.kissPlatypus(0);
@@ -513,7 +513,7 @@ void Scene02::run() {
 					gnap.walkTo(destPos, 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1);
 					gnap._actionStatus = kAS02UseTwigWithChicken;
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y + 1, 9, 8);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[1] + Common::Point(0, 1), 9, 8);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
@@ -557,11 +557,11 @@ void Scene02::run() {
 						gnap._actionStatus = kAS02UseGasWithTruck;
 					_vm->_hotspots[kHS02WalkArea4]._flags &= ~SF_WALKABLE;
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 2, 2);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[2], 2, 2);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(2, 2);
+						gnap.playScratchingHead(Common::Point(2, 2));
 						break;
 					case GRAB_CURSOR:
 						if (_vm->isFlag(kGFTruckKeysUsed)) {
@@ -589,7 +589,7 @@ void Scene02::run() {
 		case kHS02TruckGrill:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 2, 4);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[4], 2, 4);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
@@ -956,7 +956,7 @@ void Scene03::run() {
 						if (_vm->isFlag(kGFKeysTaken))
 							gnap.playMoan1(plat._pos);
 						else
-							gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+							gnap.playScratchingHead(plat._pos);
 						break;
 					case GRAB_CURSOR:
 						gnap.kissPlatypus(0);
@@ -982,11 +982,11 @@ void Scene03::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(9, 6);
+						gnap.playScratchingHead(Common::Point(9, 6));
 						break;
 					case GRAB_CURSOR:
 						gnap.playPullOutDevice(Common::Point(9, 6));
-						gnap.playUseDevice(0, 0);
+						gnap.playUseDevice();
 						gameSys.insertSequence(0x1B3, 253, 0x1B2, 253, kSeqSyncWait, 0, 0, 0);
 						gameSys.setAnimation(0x1B3, 253, 5);
 						_vm->_hotspots[kHS03Grass]._flags |= SF_WALKABLE | SF_DISABLED;
@@ -1051,7 +1051,7 @@ void Scene03::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(8, 4);
+						gnap.playScratchingHead(Common::Point(8, 4));
 						break;
 					case GRAB_CURSOR:
 						if (_platypusHypnotized) {
@@ -1464,7 +1464,7 @@ void Scene04::run() {
 						if (_vm->isFlag(kGFKeysTaken))
 							gnap.playMoan1(plat._pos);
 						else
-							gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+							gnap.playScratchingHead(plat._pos);
 						break;
 					case GRAB_CURSOR:
 						if (_vm->_cursorValue == 4)
@@ -1491,11 +1491,11 @@ void Scene04::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
+						gnap.playScratchingHead(_vm->_hotspotsWalkPos[1]);
 						break;
 					case GRAB_CURSOR:
 						gnap.playPullOutDevice(_vm->_hotspotsWalkPos[1]);
-						gnap.playUseDevice(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
+						gnap.playUseDevice(_vm->_hotspotsWalkPos[1]);
 						gameSys.insertSequence(0x1FD, 100, 510, 100, kSeqSyncWait, 0, 0, 0);
 						gameSys.setAnimation(0x1FD, 100, 2);
 						break;
@@ -1511,7 +1511,7 @@ void Scene04::run() {
 		case kHS04Axe:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 9, 5);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[3], 9, 5);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
@@ -1536,7 +1536,7 @@ void Scene04::run() {
 		case kHS04Dog:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 9, 7);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[2], 9, 7);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
@@ -1568,12 +1568,12 @@ void Scene04::run() {
 		case kHS04Door:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 4, 3);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 4, 3);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
 					case PLAT_CURSOR:
-						gnap.playScratchingHead(4, 3);
+						gnap.playScratchingHead(Common::Point(4, 3));
 						break;
 					case GRAB_CURSOR:
 						if (_vm->_cursorValue == 1) {
@@ -1613,7 +1613,7 @@ void Scene04::run() {
 		case kHS04Window:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 2, 3);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 2, 3);
 				} else if (_vm->isFlag(kGFKeysTaken)) {
 					gnap.playImpossible();
 				} else {
@@ -1629,7 +1629,7 @@ void Scene04::run() {
 						}
 						break;
 					case GRAB_CURSOR:
-						gnap.playScratchingHead(_vm->_hotspotsWalkPos[7].x, _vm->_hotspotsWalkPos[7].y);
+						gnap.playScratchingHead(_vm->_hotspotsWalkPos[7]);
 						break;
 					case TALK_CURSOR:
 					case PLAT_CURSOR:
@@ -1942,7 +1942,7 @@ void Scene05::run() {
 						if (_vm->isFlag(kGFKeysTaken))
 							gnap.playMoan1(plat._pos);
 						else
-							gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+							gnap.playScratchingHead(plat._pos);
 						break;
 					case GRAB_CURSOR:
 						gnap.kissPlatypus(0);
@@ -1962,13 +1962,13 @@ void Scene05::run() {
 		case kHS05Haystack:
 			if (gnap._actionStatus < 0 && plat._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[1].x - 2, _vm->_hotspotsWalkPos[1].y, 4, 5);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[1] + Common::Point(-2, 0), 4, 5);
 				} else if (_vm->isFlag(kGFNeedleTaken)) {
 					gnap.playImpossible();
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y - 1);
+						gnap.playScratchingHead(Common::Point(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y - 1));
 						break;
 					case GRAB_CURSOR:
 					case TALK_CURSOR:
@@ -1999,7 +1999,7 @@ void Scene05::run() {
 					gnap.walkTo(checkPt, 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1);
 					gnap._actionStatus = kAS05UseTwigWithChicken;
 				} else if (_vm->_grabCursorSpriteIndex >= 0)
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y + 1, 9, 7);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot] + Common::Point(0, 1), 9, 7);
 				else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
@@ -2026,7 +2026,7 @@ void Scene05::run() {
 		case kHS05Ladder:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 2, 5);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 2, 5);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
@@ -2062,11 +2062,11 @@ void Scene05::run() {
 						gnap.getSequenceId(gskIdle, _vm->_hotspotsWalkPos[2]) | 0x10000, 1))
 						gnap._actionStatus = kAS05PickPadlock;
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 7, 4);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[2], 7, 4);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(7, 4);
+						gnap.playScratchingHead(Common::Point(7, 4));
 						break;
 					case GRAB_CURSOR:
 						gnap._idleFacing = kDirUpRight;
@@ -2371,7 +2371,7 @@ void Scene06::run() {
 						if (_vm->isFlag(kGFKeysTaken))
 							gnap.playMoan1(plat._pos);
 						else
-							gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+							gnap.playScratchingHead(plat._pos);
 						break;
 					case GRAB_CURSOR:
 						gnap.kissPlatypus(0);
@@ -2391,11 +2391,11 @@ void Scene06::run() {
 		case kHS06Gas:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 5, 0);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 5, 0);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(5, 0);
+						gnap.playScratchingHead(Common::Point(5, 0));
 						break;
 					case GRAB_CURSOR:
 						if (_vm->isFlag(kGFUnk04)) {
@@ -2415,7 +2415,7 @@ void Scene06::run() {
 						if (_vm->isFlag(kGFUnk04))
 							gnap.playImpossible();
 						else
-							gnap.playScratchingHead(5, 0);
+							gnap.playScratchingHead(Common::Point(5, 0));
 						break;
 					}
 				}
@@ -2425,11 +2425,11 @@ void Scene06::run() {
 		case kHS06Ladder:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 8, 4);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 8, 4);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(8, 4);
+						gnap.playScratchingHead(Common::Point(8, 4));
 						break;
 					case GRAB_CURSOR:
 						if (_vm->isFlag(kGFGasTaken))
@@ -2461,11 +2461,11 @@ void Scene06::run() {
 					gnap._actionStatus = kAS06UseTwigOnHorse;
 					_vm->setGrabCursorSprite(-1);
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 3, 2);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 3, 2);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(3, 2);
+						gnap.playScratchingHead(Common::Point(3, 2));
 						break;
 					case TALK_CURSOR:
 						if (_horseTurnedBack) {
@@ -2771,7 +2771,7 @@ void Scene07::run() {
 
 		case kHS07Dice:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
-				gnap.playShowCurrItem(4, 8, 3, 3);
+				gnap.playShowCurrItem(Common::Point(4, 8), 3, 3);
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
@@ -3019,7 +3019,7 @@ void Scene08::run() {
 					if (_vm->isFlag(kGFSceneFlag1))
 						gnap.playMoan1(plat._pos);
 					else
-						gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+						gnap.playScratchingHead(plat._pos);
 					break;
 				case GRAB_CURSOR:
 					gnap.actionIdle(0x14D);
@@ -3055,7 +3055,7 @@ void Scene08::run() {
 
 		case kHS08Man:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
-				gnap.playShowCurrItem(6, 6, 7, 0);
+				gnap.playShowCurrItem(Common::Point(6, 6), 7, 0);
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
@@ -3087,13 +3087,13 @@ void Scene08::run() {
 
 		case kHS08Door:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
-				gnap.playShowCurrItem(4, 7, 5, 0);
+				gnap.playShowCurrItem(Common::Point(4, 7), 5, 0);
 				gameSys.setAnimation(makeRid(gnap._sequenceDatNum, gnap._sequenceId), gnap._id, 0);
 				gnap._actionStatus = kAS08GrabDog;
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
-					gnap.playScratchingHead(6, 0);
+					gnap.playScratchingHead(Common::Point(6, 0));
 					gameSys.setAnimation(makeRid(gnap._sequenceDatNum, gnap._sequenceId), gnap._id, 0);
 					gnap._actionStatus = kAS08LookDog;
 					break;
@@ -3123,19 +3123,19 @@ void Scene08::run() {
 
 		case kHS08Meat:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
-				gnap.playShowCurrItem(6, 8, 5, 6);
+				gnap.playShowCurrItem(Common::Point(6, 8), 5, 6);
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
-					gnap.playScratchingHead(6, 7);
+					gnap.playScratchingHead(Common::Point(6, 7));
 					break;
 				case GRAB_CURSOR:
 					if (_currDogSequenceId == 0x135) {
-						gnap.playScratchingHead(6, 7);
+						gnap.playScratchingHead(Common::Point(6, 7));
 					} else {
 						gnap.actionIdle(0x14D);
 						gnap.playPullOutDevice(Common::Point(6, 7));
-						gnap.playUseDevice(0, 0);
+						gnap.playUseDevice();
 						_nextDogSequenceId = 0x149;
 					}
 					break;
@@ -3149,19 +3149,19 @@ void Scene08::run() {
 
 		case kHS08Bone:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
-				gnap.playShowCurrItem(2, 7, 3, 6);
+				gnap.playShowCurrItem(Common::Point(2, 7), 3, 6);
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
-					gnap.playScratchingHead(3, 6);
+					gnap.playScratchingHead(Common::Point(3, 6));
 					break;
 				case GRAB_CURSOR:
 					if (_currDogSequenceId == 0x135) {
-						gnap.playScratchingHead(3, 6);
+						gnap.playScratchingHead(Common::Point(3, 6));
 					} else {
 						gnap.actionIdle(0x14D);
 						gnap.playPullOutDevice(Common::Point(3, 6));
-						gnap.playUseDevice(0, 0);
+						gnap.playUseDevice();
 						_nextDogSequenceId = 0x14A;
 					}
 					break;
@@ -3175,19 +3175,19 @@ void Scene08::run() {
 
 		case kHS08Toy:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
-				gnap.playShowCurrItem(8, 7, 7, 6);
+				gnap.playShowCurrItem(Common::Point(8, 7), 7, 6);
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
-					gnap.playScratchingHead(7, 6);
+					gnap.playScratchingHead(Common::Point(7, 6));
 					break;
 				case GRAB_CURSOR:
 					if (_currDogSequenceId == 0x135) {
-						gnap.playScratchingHead(7, 6);
+						gnap.playScratchingHead(Common::Point(7, 6));
 					} else {
 						gnap.actionIdle(0x14D);
 						gnap.playPullOutDevice(Common::Point(7, 6));
-						gnap.playUseDevice(0, 0);
+						gnap.playUseDevice();
 						_nextDogSequenceId = 0x14B;
 					}
 					break;
@@ -3487,11 +3487,11 @@ void Scene09::run() {
 
 		case kHS09Trash:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
-				gnap.playShowCurrItem(9, 6, 8, 0);
+				gnap.playShowCurrItem(Common::Point(9, 6), 8, 0);
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
-					gnap.playScratchingHead(8, 3);
+					gnap.playScratchingHead(Common::Point(8, 3));
 					break;
 				case GRAB_CURSOR:
 					gnap._actionStatus = kAS09SearchTrash;
diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp
index 0560cfd666..9d6838ec81 100644
--- a/engines/gnap/scenes/group1.cpp
+++ b/engines/gnap/scenes/group1.cpp
@@ -116,7 +116,7 @@ void Scene10::run() {
 					if (_vm->isFlag(kGFMudTaken))
 						gnap.playMoan1(plat._pos);
 					else
-						gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+						gnap.playScratchingHead(plat._pos);
 					break;
 				case GRAB_CURSOR:
 					gnap.kissPlatypus(10);
@@ -151,13 +151,13 @@ void Scene10::run() {
 
 		case kHS10Cook:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
-				gnap.playShowCurrItem(4, 8, 6, 0);
+				gnap.playShowCurrItem(Common::Point(4, 8), 6, 0);
 				gameSys.setAnimation(makeRid(gnap._sequenceDatNum, gnap._sequenceId), gnap._id, 0);
 				gnap._actionStatus = kAS10AnnoyCook;
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
-					gnap.playScratchingHead(6, 0);
+					gnap.playScratchingHead(Common::Point(6, 0));
 					break;
 				case GRAB_CURSOR:
 					gnap.playImpossible();
@@ -182,14 +182,14 @@ void Scene10::run() {
 
 		case kHS10Tongs:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
-				gnap.playShowCurrItem(3, 7, 4, 0);
+				gnap.playShowCurrItem(Common::Point(3, 7), 4, 0);
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
 					if (_vm->isFlag(kGFMudTaken))
 						gnap.playMoan2(Common::Point(-1, -1));
 					else
-						gnap.playScratchingHead(4, 3);
+						gnap.playScratchingHead(Common::Point(4, 3));
 					break;
 				case GRAB_CURSOR:
 					if (_vm->isFlag(kGFMudTaken))
@@ -220,11 +220,11 @@ void Scene10::run() {
 
 		case kHS10Box:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
-				gnap.playShowCurrItem(7, 6, 6, 0);
+				gnap.playShowCurrItem(Common::Point(7, 6), 6, 0);
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
-					gnap.playScratchingHead(7, 3);
+					gnap.playScratchingHead(Common::Point(7, 3));
 					break;
 				case GRAB_CURSOR:
 					gnap.actionIdle(0x10C);
@@ -255,7 +255,7 @@ void Scene10::run() {
 
 		case kHS10Oven:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
-				gnap.playShowCurrItem(9, 6, 10, 0);
+				gnap.playShowCurrItem(Common::Point(9, 6), 10, 0);
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
@@ -657,11 +657,11 @@ void Scene11::run() {
 					gnap._actionStatus = kAS11ShowMagazineToGoggleGuy;
 					gnap.playShowItem(_vm->_grabCursorSpriteIndex, 2, 0);
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(3, 7, 2, 0);
+					gnap.playShowCurrItem(Common::Point(3, 7), 2, 0);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(1, 6);
+						gnap.playScratchingHead(Common::Point(1, 6));
 						break;
 					case GRAB_CURSOR:
 					case PLAT_CURSOR:
@@ -713,7 +713,7 @@ void Scene11::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(9, 8);
+						gnap.playScratchingHead(Common::Point(9, 8));
 						break;
 					case GRAB_CURSOR:
 						gnap.walkTo(Common::Point(9, 8), 0, 0x107BA, 1);
@@ -1077,7 +1077,7 @@ void Scene12::run() {
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
-					gnap.playScratchingHead(1, 2);
+					gnap.playScratchingHead(Common::Point(1, 2));
 					break;
 				case GRAB_CURSOR:
 					gnap.walkTo(Common::Point(3, 7), 0, 0x107BC, 1);
@@ -1576,7 +1576,7 @@ void Scene13::run() {
 
 		case kHS13BackToilet:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
-				gnap.playShowCurrItem(5, 5, 6, 0);
+				gnap.playShowCurrItem(Common::Point(5, 5), 6, 0);
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
@@ -1607,7 +1607,7 @@ void Scene13::run() {
 
 		case kHS13FrontToilet:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
-				gnap.playShowCurrItem(6, 7, 7, 0);
+				gnap.playShowCurrItem(Common::Point(6, 7), 7, 0);
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
@@ -1624,7 +1624,7 @@ void Scene13::run() {
 
 		case kHS13Scribble:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
-				gnap.playShowCurrItem(7, 7, 8, 0);
+				gnap.playShowCurrItem(Common::Point(7, 7), 8, 0);
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
@@ -1633,7 +1633,7 @@ void Scene13::run() {
 					gnap._idleFacing = kDirUpRight;
 					break;
 				case GRAB_CURSOR:
-					gnap.playScratchingHead(0, 0);
+					gnap.playScratchingHead();
 					break;
 				case TALK_CURSOR:
 					gnap._idleFacing = kDirUpRight;
@@ -1648,7 +1648,7 @@ void Scene13::run() {
 
 		case kHS13Urinal:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
-				gnap.playShowCurrItem(8, 7, 9, 0);
+				gnap.playShowCurrItem(Common::Point(8, 7), 9, 0);
 			} else {
 				switch (_vm->_verbCursor) {
 				case LOOK_CURSOR:
@@ -2572,12 +2572,12 @@ void Scene17::run() {
 						_vm->invRemove(kItemJoint);
 					}
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+					gnap.playScratchingHead(plat._pos);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
 					case GRAB_CURSOR:
-						gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+						gnap.playScratchingHead(plat._pos);
 						break;
 					case TALK_CURSOR:
 						gnap.playBrainPulsating(plat._pos);
@@ -2596,12 +2596,12 @@ void Scene17::run() {
 				if (_vm->isFlag(kGFGrassTaken)) {
 					gnap.playImpossible();
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 8, 7);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 8, 7);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
 					case GRAB_CURSOR:
-						gnap.playScratchingHead(8, 7);
+						gnap.playScratchingHead(Common::Point(8, 7));
 						break;
 					case TALK_CURSOR:
 						gnap.playImpossible();
@@ -2628,11 +2628,11 @@ void Scene17::run() {
 					gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1);
 					gnap._actionStatus = kAS17PutCoinIntoPhone;
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 1, 3);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[2], 1, 3);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(1, 3);
+						gnap.playScratchingHead(Common::Point(1, 3));
 						break;
 					case GRAB_CURSOR:
 						if (_vm->isFlag(kGFUnk18)) {
@@ -2669,11 +2669,11 @@ void Scene17::run() {
 					gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1);
 					gnap._actionStatus = kAS17PutCoinIntoPhone;
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 1, 3);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[2], 1, 3);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(1, 3);
+						gnap.playScratchingHead(Common::Point(1, 3));
 						break;
 					case GRAB_CURSOR:
 						if (_vm->isFlag(kGFUnk18)) {
@@ -2863,7 +2863,7 @@ void Scene17::updateAnimations() {
 			break;
 		case kAS17GetCoinFromPhone:
 			gnap.playPullOutDevice(Common::Point(1, 3));
-			gnap.playUseDevice(0, 0);
+			gnap.playUseDevice();
 			gameSys.setAnimation(0x250, 100, 0);
 			gameSys.insertSequence(0x250, 100, 591, 100, kSeqSyncWait, 0, 0, 0);
 			_vm->invAdd(kItemDiceQuarterHole);
@@ -3513,11 +3513,11 @@ void Scene18::run() {
 					putDownGarbageCan(0);
 				}
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18CowboyHat].x, _vm->_hotspotsWalkPos[kHS18CowboyHat].y, 3, 2);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18CowboyHat], 3, 2);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(3, 2);
+						gnap.playScratchingHead(Common::Point(3, 2));
 						break;
 					case GRAB_CURSOR:
 						gnap.walkTo(_vm->_hotspotsWalkPos[kHS18CowboyHat], 0, gnap.getSequenceId(gskPullOutDeviceNonWorking, Common::Point(3, 2)) | 0x10000, 1);
@@ -3535,25 +3535,27 @@ void Scene18::run() {
 			if (gnap._actionStatus < 0) {
 				if (_vm->isFlag(kGFUnk14)) {
 					if (_vm->_grabCursorSpriteIndex >= 0)
-						gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18GarbageCan].x, _vm->_hotspotsWalkPos[kHS18GarbageCan].y, 1, 5);
+						gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18GarbageCan], 1, 5);
 					else
 						gnap.playImpossible();
 				} else {
 					if (_vm->isFlag(kGFPlatypusTalkingToAssistant))
 						platEndPhoning(true);
 					if (_vm->_grabCursorSpriteIndex >= 0) {
-						if (!_vm->isFlag(kGFTruckKeysUsed))
-							gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18GarbageCan].x - (gnap._pos.x < _vm->_s18GarbageCanPos ? 1 : -1),
-								_vm->_hotspotsWalkPos[kHS18GarbageCan].y, _vm->_hotspotsWalkPos[kHS18GarbageCan].x, _vm->_hotspotsWalkPos[kHS18GarbageCan].y);
-						else
-							gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18GarbageCan].x, _vm->_hotspotsWalkPos[kHS18GarbageCan].y, 2, 4);
+						if (!_vm->isFlag(kGFTruckKeysUsed)) {
+							Common::Point destPos;
+							destPos.x = _vm->_hotspotsWalkPos[kHS18GarbageCan].x - (gnap._pos.x < _vm->_s18GarbageCanPos ? 1 : -1);
+							destPos.y = _vm->_hotspotsWalkPos[kHS18GarbageCan].y;
+							gnap.playShowCurrItem(destPos, _vm->_hotspotsWalkPos[kHS18GarbageCan].x, _vm->_hotspotsWalkPos[kHS18GarbageCan].y);
+						} else
+							gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18GarbageCan], 2, 4);
 					} else {
 						switch (_vm->_verbCursor) {
 						case LOOK_CURSOR:
 							if (!_vm->isFlag(kGFTruckKeysUsed))
-								gnap.playScratchingHead(_vm->_hotspotsWalkPos[kHS18GarbageCan].x - (gnap._pos.x < _vm->_s18GarbageCanPos ? 1 : -1), _vm->_hotspotsWalkPos[kHS18GarbageCan].y);
+								gnap.playScratchingHead(Common::Point(_vm->_hotspotsWalkPos[kHS18GarbageCan].x - (gnap._pos.x < _vm->_s18GarbageCanPos ? 1 : -1), _vm->_hotspotsWalkPos[kHS18GarbageCan].y));
 							else if (!_vm->isFlag(kGFTruckFilledWithGas))
-								gnap.playScratchingHead(2, 4);
+								gnap.playScratchingHead(Common::Point(2, 4));
 							break;
 						case GRAB_CURSOR:
 							if (!_vm->isFlag(kGFTruckKeysUsed)) {
@@ -3589,7 +3591,7 @@ void Scene18::run() {
 						case LOOK_CURSOR:
 							gnapCarryGarbageCanTo(-1);
 							putDownGarbageCan(0);
-							gnap.playScratchingHead(0, 0);
+							gnap.playScratchingHead();
 							break;
 						case GRAB_CURSOR:
 							if (_vm->isFlag(kGFTruckFilledWithGas)) {
@@ -3617,11 +3619,11 @@ void Scene18::run() {
 						gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(gskIdle, Common::Point(2, 8)) | 0x10000, 1);
 						gnap._actionStatus = kAS18OpenTopValve;
 					} else if (_vm->_grabCursorSpriteIndex >= 0) {
-						gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18HydrantTopValve].x, _vm->_hotspotsWalkPos[kHS18HydrantTopValve].y, 1, 5);
+						gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18HydrantTopValve], 1, 5);
 					} else {
 						switch (_vm->_verbCursor) {
 						case LOOK_CURSOR:
-							gnap.playScratchingHead(1, 5);
+							gnap.playScratchingHead(Common::Point(1, 5));
 							break;
 						case GRAB_CURSOR:
 							if (_vm->isFlag(kGFBarnPadlockOpen)) {
@@ -3648,7 +3650,7 @@ void Scene18::run() {
 					if (_vm->_grabCursorSpriteIndex == -1) {
 						gnap.playImpossible();
 					} else {
-						gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18HydrantRightValve].x, _vm->_hotspotsWalkPos[kHS18HydrantRightValve].y, 1, 5);
+						gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18HydrantRightValve], 1, 5);
 					}
 				} else {
 					if (_vm->isFlag(kGFPlatypusDisguised)) {
@@ -3662,11 +3664,11 @@ void Scene18::run() {
 						else
 							gnap._actionStatus = kAS18OpenRightValveNoGarbageCan;
 					} else if (_vm->_grabCursorSpriteIndex >= 0) {
-						gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18HydrantRightValve].x, _vm->_hotspotsWalkPos[kHS18HydrantRightValve].y, 1, 5);
+						gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18HydrantRightValve], 1, 5);
 					} else {
 						switch (_vm->_verbCursor) {
 						case LOOK_CURSOR:
-							gnap.playScratchingHead(1, 5);
+							gnap.playScratchingHead(Common::Point(1, 5));
 							break;
 						case GRAB_CURSOR:
 							if (_vm->isFlag(kGFTruckFilledWithGas)) {
@@ -3882,7 +3884,7 @@ void Scene18::updateAnimations() {
 			_vm->setFlag(kGFBarnPadlockOpen);
 			updateHotspots();
 			gnap.playPullOutDevice(Common::Point(2, 7));
-			gnap.playUseDevice(0, 0);
+			gnap.playUseDevice();
 			gameSys.insertSequence(0x20C, 19, 0, 0, kSeqNone, 0, 0, 0);
 			_vm->_hotspots[kHS18WalkArea2]._flags |= SF_WALKABLE;
 			gnap.walkTo(_vm->_hotspotsWalkPos[kHS18HydrantTopValve], 0, 0x107BB, 1);
@@ -3980,7 +3982,7 @@ void Scene18::updateAnimations() {
 			_vm->setFlag(kGFTruckFilledWithGas);
 			updateHotspots();
 			gnap.playPullOutDevice(Common::Point(2, 7));
-			gnap.playUseDevice(0, 0);
+			gnap.playUseDevice();
 			gameSys.insertSequence(0x20B, 19, 0, 0, kSeqNone, 0, 0, 0);
 			_vm->_hotspots[kHS18WalkArea2]._flags |= SF_WALKABLE;
 			gnap.walkTo(_vm->_hotspotsWalkPos[kHS18HydrantRightValve], 0, 0x107BA, 1);
@@ -4230,11 +4232,11 @@ void Scene19::run() {
 		case kHS19Picture:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 6, 2);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 6, 2);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(6, 2);
+						gnap.playScratchingHead(Common::Point(6, 2));
 						break;
 					case GRAB_CURSOR:
 						if (!_vm->isFlag(kGFPictureTaken)) {
@@ -4254,11 +4256,11 @@ void Scene19::run() {
 		case kHS19ShopAssistant:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 6, 2);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 6, 2);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(6, 2);
+						gnap.playScratchingHead(Common::Point(6, 2));
 						break;
 					case TALK_CURSOR:
 						gnap._idleFacing = kDirUpRight;
@@ -4306,11 +4308,11 @@ void Scene19::run() {
 		case kHS19Phone:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 9, 1);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 9, 1);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(9, 1);
+						gnap.playScratchingHead(Common::Point(9, 1));
 						break;
 					case GRAB_CURSOR:
 						gnap.walkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 0, -1, 1);
@@ -4403,7 +4405,7 @@ void Scene19::updateAnimations() {
 			break;
 		case kAS19GrabPicture:
 			gnap.playPullOutDevice(Common::Point(6, 2));
-			gnap.playUseDevice(0, 0);
+			gnap.playUseDevice();
 			gameSys.setAnimation(0x68, 19, 0);
 			gameSys.insertSequence(0x68, 19, 105, 19, kSeqSyncWait, 0, 0, 0);
 			_vm->invAdd(kItemPicture);
diff --git a/engines/gnap/scenes/group2.cpp b/engines/gnap/scenes/group2.cpp
index e832f35173..ff315c5df7 100644
--- a/engines/gnap/scenes/group2.cpp
+++ b/engines/gnap/scenes/group2.cpp
@@ -70,7 +70,7 @@ void Scene20::updateAnimationsCb() {
 		case 0x16A:
 			// Grab joint
 			gnap.playPullOutDevice(Common::Point(4, 4));
-			gnap.playUseDevice(0, 0);
+			gnap.playUseDevice();
 			gameSys.setAnimation(0x16A, 21, 0);
 			gameSys.insertSequence(0x16A, 21, _currStonerGuySequenceId, 21, kSeqSyncWait, 0, 0, 0);
 			_currStonerGuySequenceId = 0x16A;
@@ -282,7 +282,7 @@ void Scene20::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+						gnap.playScratchingHead(plat._pos);
 						break;
 					case GRAB_CURSOR:
 						gnap.kissPlatypus(20);
@@ -366,7 +366,7 @@ void Scene20::run() {
 		case kHS20StonerGuy:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS20StonerGuy].x, _vm->_hotspotsWalkPos[kHS20StonerGuy].y, 5, 4);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS20StonerGuy], 5, 4);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
@@ -399,11 +399,11 @@ void Scene20::run() {
 		case kHS20GroceryStoreGuy:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy].x, _vm->_hotspotsWalkPos[kHS20GroceryStoreGuy].y, 2, 4);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy], 2, 4);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(2, 3);
+						gnap.playScratchingHead(Common::Point(2, 3));
 						break;
 					case GRAB_CURSOR:
 						_stonerGuyShowingJoint = false;
@@ -431,11 +431,11 @@ void Scene20::run() {
 					gnap.walkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreHat], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1);
 					gnap._actionStatus = kAS20SwitchGroceryStoreHat;
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS20GroceryStoreHat].x, _vm->_hotspotsWalkPos[kHS20GroceryStoreHat].y, 1, 6);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS20GroceryStoreHat], 1, 6);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(1, 6);
+						gnap.playScratchingHead(Common::Point(1, 6));
 						break;
 					case GRAB_CURSOR:
 						_stonerGuyShowingJoint = false;
@@ -803,7 +803,7 @@ void Scene21::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+						gnap.playScratchingHead(plat._pos);
 						break;
 					case GRAB_CURSOR:
 						gnap.kissPlatypus(0);
@@ -827,12 +827,12 @@ void Scene21::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(2, 5);
+						gnap.playScratchingHead(Common::Point(2, 5));
 						break;
 					case GRAB_CURSOR:
 						gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(gskIdle, _vm->_hotspotsWalkPos[kHS21Banana]) | 0x10000, 1);
 						gnap.playPullOutDevice(Common::Point(2, 5));
-						gnap.playUseDevice(0, 0);
+						gnap.playUseDevice();
 						gnap._actionStatus = kAS21GrabBanana;
 						break;
 					case TALK_CURSOR:
@@ -850,11 +850,11 @@ void Scene21::run() {
 					gnap.walkTo(Common::Point(4, 6), 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1);
 					gnap._actionStatus = kAS21UseHatWithOldLady;
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(4, 6, 7, 4);
+					gnap.playShowCurrItem(Common::Point(4, 6), 7, 4);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(7, 4);
+						gnap.playScratchingHead(Common::Point(7, 4));
 						break;
 					case GRAB_CURSOR:
 						gnap._idleFacing = kDirUpLeft;
@@ -1122,7 +1122,7 @@ void Scene22::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+						gnap.playScratchingHead(plat._pos);
 						break;
 					case GRAB_CURSOR:
 						gnap.kissPlatypus(0);
@@ -1162,11 +1162,11 @@ void Scene22::run() {
 		case kHS22Cashier:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS22Cashier].x, _vm->_hotspotsWalkPos[kHS22Cashier].y, 8, 4);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS22Cashier], 8, 4);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(8, 4);
+						gnap.playScratchingHead(Common::Point(8, 4));
 						break;
 					case GRAB_CURSOR:
 						gnap.playImpossible();
@@ -1348,7 +1348,7 @@ void Scene23::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+						gnap.playScratchingHead(plat._pos);
 						break;
 					case GRAB_CURSOR:
 						gnap.kissPlatypus(0);
@@ -1368,7 +1368,7 @@ void Scene23::run() {
 		case kHS23Cereals:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS23Cereals].x, _vm->_hotspotsWalkPos[kHS23Cereals].y, 5, 4);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS23Cereals], 5, 4);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
@@ -1619,7 +1619,7 @@ void Scene24::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+						gnap.playScratchingHead(plat._pos);
 						break;
 					case GRAB_CURSOR:
 						gnap.kissPlatypus(0);
@@ -1868,7 +1868,7 @@ void Scene25::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(plat._pos.x, plat._pos.y);
+						gnap.playScratchingHead(plat._pos);
 						break;
 					case GRAB_CURSOR:
 						gnap.kissPlatypus(0);
@@ -1891,14 +1891,14 @@ void Scene25::run() {
 					gnap._actionStatus = kAS25ShowTicketToVendor;
 					gnap.walkTo(_vm->_hotspotsWalkPos[kHS25TicketVendor], 0, gnap.getSequenceId(gskIdle, Common::Point(9, 4)) | 0x10000, 1);
 					gnap.playPullOutDevice();
-					gnap.playUseDevice(0, 0);
+					gnap.playUseDevice();
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS25TicketVendor].x, _vm->_hotspotsWalkPos[kHS25TicketVendor].y, 6, 1);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS25TicketVendor], 6, 1);
 					_nextTicketVendorSequenceId = 0x5B;
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(6, 1);
+						gnap.playScratchingHead(Common::Point(6, 1));
 						_nextTicketVendorSequenceId = (_vm->getRandom(2) == 1) ? 0x59 : 0x56;
 						break;
 					case TALK_CURSOR:
@@ -2448,11 +2448,11 @@ void Scene27::run() {
 					if (gnap.walkTo(_vm->_hotspotsWalkPos[kHS27Janitor], 0, 0x107BC, 1))
 						gnap._actionStatus = kAS27ShowPictureToJanitor;
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS27Janitor].x, _vm->_hotspotsWalkPos[kHS27Janitor].y, 7, 3);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS27Janitor], 7, 3);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(6, 3);
+						gnap.playScratchingHead(Common::Point(6, 3));
 						break;
 					case TALK_CURSOR:
 						gnap._idleFacing = kDirUpLeft;
@@ -2475,7 +2475,7 @@ void Scene27::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(3, 3);
+						gnap.playScratchingHead(Common::Point(3, 3));
 						break;
 					case GRAB_CURSOR:
 						gnap._idleFacing = kDirUpLeft;
@@ -2614,7 +2614,7 @@ void Scene27::updateAnimations() {
 			break;
 		case kAS27GrabBucket:
 			gnap.playPullOutDevice();
-			gnap.playUseDevice(0, 0);
+			gnap.playUseDevice();
 			_vm->_hotspots[kHS27Bucket]._flags = SF_DISABLED;
 			_vm->invAdd(kItemEmptyBucket);
 			_vm->setFlag(kGFUnk13);
@@ -2676,7 +2676,7 @@ void Scene27::updateAnimations() {
 		case 0xD0:
 			// Show picture to janitor
 			gnap.playPullOutDevice();
-			gnap.playUseDevice(0, 0);
+			gnap.playUseDevice();
 			gameSys.insertSequence(_nextJanitorSequenceId, 39, _currJanitorSequenceId, 39, kSeqSyncWait, 0, 0, 0);
 			gameSys.setAnimation(_nextJanitorSequenceId, 39, 0);
 			gnap._actionStatus = kAS27EnterClownTent;
@@ -2818,11 +2818,11 @@ void Scene28::run() {
 		case kHS28Horn:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(2, 8, 3, 4);
+					gnap.playShowCurrItem(Common::Point(2, 8), 3, 4);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(2, 4);
+						gnap.playScratchingHead(Common::Point(2, 4));
 						break;
 					case GRAB_CURSOR:
 						if (_vm->isFlag(kGFUnk21)) {
@@ -2852,27 +2852,27 @@ void Scene28::run() {
 			if (gnap._actionStatus < 0) {
 				if (_vm->isFlag(kGFUnk21)) {
 					if (_vm->_verbCursor == LOOK_CURSOR)
-						gnap.playScratchingHead(5, 2);
+						gnap.playScratchingHead(Common::Point(5, 2));
 					else
 						gnap.playImpossible();
 				} else if (_vm->_grabCursorSpriteIndex == kItemBucketWithBeer) {
 					gnap._idleFacing = kDirUpLeft;
 					gnap.walkTo(_vm->_hotspotsWalkPos[kHS28Clown], 0, 0x107BC, 1);
 					gnap.playPullOutDevice();
-					gnap.playUseDevice(0, 0);
+					gnap.playUseDevice();
 					gnap._actionStatus = kAS28UseBeerBucketWithClown;
 				} else if (_vm->_grabCursorSpriteIndex == kItemBucketWithPill) {
 					gnap._idleFacing = kDirUpLeft;
 					gnap.walkTo(_vm->_hotspotsWalkPos[kHS28Clown], 0, 0x107BC, 1);
 					gnap.playPullOutDevice();
-					gnap.playUseDevice(0, 0);
+					gnap.playUseDevice();
 					gnap._actionStatus = kAS28UsePillBucketWithClown;
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS28Clown].x, _vm->_hotspotsWalkPos[kHS28Clown].y, 2, 4);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS28Clown], 2, 4);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(5, 2);
+						gnap.playScratchingHead(Common::Point(5, 2));
 						break;
 					case TALK_CURSOR:
 						gnap._idleFacing = kDirUpLeft;
@@ -2909,7 +2909,7 @@ void Scene28::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(8, 6);
+						gnap.playScratchingHead(Common::Point(8, 6));
 						break;
 					case GRAB_CURSOR:
 						gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(gskIdle, _vm->_hotspotsWalkPos[kHS28EmptyBucket]) | 0x10000, 1);
@@ -2990,7 +2990,7 @@ void Scene28::updateAnimations() {
 			break;
 		case kAS28GrabHornSuccess:
 			gnap.playPullOutDevice();
-			gnap.playUseDevice(0, 0);
+			gnap.playUseDevice();
 			gameSys.setAnimation(0x117, 59, 0);
 			gameSys.insertSequence(0x117, 59, 280, 59, kSeqSyncWait, 0, 0, 0);
 			gnap._actionStatus = kAS28GrabHornSuccessDone;
@@ -3012,7 +3012,7 @@ void Scene28::updateAnimations() {
 			break;
 		case kAS28GrabEmptyBucket:
 			gnap.playPullOutDevice();
-			gnap.playUseDevice(0, 0);
+			gnap.playUseDevice();
 			gameSys.setAnimation(0x111, 99, 0);
 			gameSys.insertSequence(0x111, 99, 274, 99, kSeqSyncWait, 0, 0, 0);
 			gnap._actionStatus = kAS28GrabEmptyBucketDone;
@@ -3219,11 +3219,11 @@ void Scene29::run() {
 					_vm->_isLeavingScene = true;
 					_vm->setGrabCursorSprite(-1);
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS29Monkey].x, _vm->_hotspotsWalkPos[kHS29Monkey].y, 5, 6);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS29Monkey], 5, 6);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(5, 6);
+						gnap.playScratchingHead(Common::Point(5, 6));
 						break;
 					case TALK_CURSOR:
 						gnap.playBrainPulsating(_vm->_hotspotsWalkPos[kHS29Monkey]);
@@ -3267,7 +3267,7 @@ void Scene29::run() {
 					gnap.playIdle(_vm->_hotspotsWalkPos[kHS29Arcade]);
 					gnap._actionStatus = kAS29LeaveScene;
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS29Arcade].x, _vm->_hotspotsWalkPos[kHS29Arcade].y, 2, 3);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS29Arcade], 2, 3);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
diff --git a/engines/gnap/scenes/group3.cpp b/engines/gnap/scenes/group3.cpp
index c29e7c176d..4832ce1dcb 100644
--- a/engines/gnap/scenes/group3.cpp
+++ b/engines/gnap/scenes/group3.cpp
@@ -123,7 +123,7 @@ void Scene30::run() {
 					gnap._actionStatus = kAS30UsePillMachine;
 					hasTakenPill = true;
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS30PillMachine].x, _vm->_hotspotsWalkPos[kHS30PillMachine].y, 8, 5);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS30PillMachine], 8, 5);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
@@ -131,7 +131,7 @@ void Scene30::run() {
 						gnap._actionStatus = kAS30LookPillMachine;
 						break;
 					case GRAB_CURSOR:
-						gnap.playScratchingHead(8, 5);
+						gnap.playScratchingHead(Common::Point(8, 5));
 						break;
 					case TALK_CURSOR:
 					case PLAT_CURSOR:
@@ -376,15 +376,15 @@ void Scene31::run() {
 			if (gnap._actionStatus < 0 || gnap._actionStatus == kAS31PlatMeasuringClown) {
 				if (gnap._actionStatus == kAS31PlatMeasuringClown) {
 					if (_vm->_verbCursor == LOOK_CURSOR)
-						gnap.playScratchingHead(2, 2);
+						gnap.playScratchingHead(Common::Point(2, 2));
 					else
 						gnap.playImpossible();
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS31MeasuringClown].x, _vm->_hotspotsWalkPos[kHS31MeasuringClown].y + 1, 2, 2);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS31MeasuringClown] + Common::Point(0, 1), 2, 2);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(2, 2);
+						gnap.playScratchingHead(Common::Point(2, 2));
 						break;
 					case GRAB_CURSOR:
 						gnap.walkTo(_vm->_hotspotsWalkPos[kHS31MeasuringClown] + Common::Point(0, 1), -1, -1, 1);
@@ -423,20 +423,20 @@ void Scene31::run() {
 					_clerkMeasureMaxCtr += 5;
 					gameSys.insertSequence(0xF8, 59, 0, 0, kSeqNone, 0, 0, 0);
 					gnap.playPullOutDevice(Common::Point(6, 8));
-					gnap.playUseDevice(0, 0);
+					gnap.playUseDevice();
 					gnap.walkTo(_vm->_hotspotsWalkPos[kHS31BeerBarrel], 0, 0x107BC, 1);
 					gnap._actionStatus = kAS31FillEmptyBucketWithBeer;
 					_vm->_timers[4] = 300;
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS31BeerBarrel].x, _vm->_hotspotsWalkPos[kHS31BeerBarrel].y, 6, 2);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS31BeerBarrel], 6, 2);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(6, 2);
+						gnap.playScratchingHead(Common::Point(6, 2));
 						break;
 					case GRAB_CURSOR:
 						if (_beerGuyDistracted) {
-							gnap.playScratchingHead(6, 2);
+							gnap.playScratchingHead(Common::Point(6, 2));
 						} else {
 							gnap.walkTo(_vm->_hotspotsWalkPos[kHS31BeerBarrel], 0, 0x107BC, 1);
 							gnap._actionStatus = kAS31UseBeerBarrel;
@@ -561,7 +561,7 @@ void Scene31::updateAnimations() {
 		case kAS31FillEmptyBucketWithBeerDone:
 			gnap._idleFacing = kDirBottomLeft;
 			gnap.playPullOutDevice();
-			gnap.playUseDevice(0, 0);
+			gnap.playUseDevice();
 			gameSys.insertSequence(0xF9, 59, 0xF8, 59, kSeqSyncWait, 0, 0, 0);
 			gnap._actionStatus = -1;
 			_vm->invAdd(kItemBucketWithBeer);
@@ -906,7 +906,7 @@ void Scene33::run() {
 		case kHS33Chicken:
 			if (gnap._actionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(7, 9, 9, 8);
+					gnap.playShowCurrItem(Common::Point(7, 9), 9, 8);
 				} else {
 					switch (_vm->_verbCursor) {
 					case GRAB_CURSOR:
@@ -1224,11 +1224,11 @@ void Scene38::run() {
 		case kHS38HuntingTrophy:
 			if (gnap._actionStatus != kAS38HoldingHuntingTrophy) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(3, 6, 2, 0);
+					gnap.playShowCurrItem(Common::Point(3, 6), 2, 0);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(0, 0);
+						gnap.playScratchingHead();
 						break;
 					case GRAB_CURSOR:
 						if (plat._actionStatus == kAS38PlatypusHoldingTrapDoor)
diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp
index b789b0e1f3..f6cb57c750 100644
--- a/engines/gnap/scenes/group4.cpp
+++ b/engines/gnap/scenes/group4.cpp
@@ -407,7 +407,7 @@ void Scene41::run() {
 					gnap.walkTo(Common::Point(4, 7), 0, 0x107BB, 9);
 					gnap.playShowItem(_vm->_grabCursorSpriteIndex, 5, 0);
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(4, 7, 5, 0);
+					gnap.playShowCurrItem(Common::Point(4, 7), 5, 0);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
@@ -434,11 +434,11 @@ void Scene41::run() {
 					gnap._idleFacing = kDirUpRight;
 					gnap._actionStatus = kAS41UseChickenBucketWithKid;
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(7, 7, 8, 0);
+					gnap.playShowCurrItem(Common::Point(7, 7), 8, 0);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(9, 0);
+						gnap.playScratchingHead(Common::Point(9, 0));
 						break;
 					case GRAB_CURSOR:
 						gnap.walkTo(Common::Point(7, 7), 0, 0x107BB, 1);
@@ -587,7 +587,7 @@ void Scene41::updateAnimations() {
 			break;
 		case kAS41UseGumWithToyUfo:
 			gameSys.setAnimation(0, 0, 0);
-			gnap.playUseDevice(9, 0);
+			gnap.playUseDevice(Common::Point(9, 0));
 			gnap._actionStatus = -1;
 			_vm->setGrabCursorSprite(-1);
 			_vm->invRemove(kItemGum);
@@ -924,11 +924,11 @@ void Scene42::run() {
 					if (plat._pos.y < 9)
 						plat.walkTo(Common::Point(plat._pos.x, 9), -1, -1, 1);
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS42BBQVendor].x, _vm->_hotspotsWalkPos[kHS42BBQVendor].y, _vm->_hotspotsWalkPos[kHS42BBQVendor].x + 1, 0);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS42BBQVendor], _vm->_hotspotsWalkPos[kHS42BBQVendor].x + 1, 0);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(_vm->_hotspotsWalkPos[kHS42BBQVendor].x - 1, 0);
+						gnap.playScratchingHead(Common::Point(_vm->_hotspotsWalkPos[kHS42BBQVendor].x - 1, 0));
 						break;
 					case TALK_CURSOR:
 						gnap._idleFacing = kDirUpRight;
@@ -945,11 +945,11 @@ void Scene42::run() {
 
 			case kHS42ChickenLeg:
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS42ChickenLeg].x, _vm->_hotspotsWalkPos[kHS42ChickenLeg].y, _vm->_hotspotsWalkPos[kHS42ChickenLeg].x - 1, 0);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS42ChickenLeg], _vm->_hotspotsWalkPos[kHS42ChickenLeg].x - 1, 0);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(_vm->_hotspotsWalkPos[kHS42ChickenLeg].x - 1, 0);
+						gnap.playScratchingHead(Common::Point(_vm->_hotspotsWalkPos[kHS42ChickenLeg].x - 1, 0));
 						break;
 					case GRAB_CURSOR:
 						gnap.walkTo(_vm->_hotspotsWalkPos[kHS42ChickenLeg], 0, 0x107BC, 1);
@@ -1380,11 +1380,11 @@ void Scene43::run() {
 
 			case kHS43TwoHeadedGuy:
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(6, 8, 7, 0);
+					gnap.playShowCurrItem(Common::Point(6, 8), 7, 0);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(7, 0);
+						gnap.playScratchingHead(Common::Point(7, 0));
 						break;
 					case TALK_CURSOR:
 							gnap._idleFacing = kDirUpRight;
@@ -1402,11 +1402,11 @@ void Scene43::run() {
 			case kHS43Key:
 			case kHS43Ufo:
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(3, 7, 2, 0);
+					gnap.playShowCurrItem(Common::Point(3, 7), 2, 0);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(0, 0);
+						gnap.playScratchingHead();
 						break;
 					case GRAB_CURSOR:
 						gnap._idleFacing = kDirUpRight;
@@ -1835,7 +1835,7 @@ void Scene44::run() {
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(4, 3);
+						gnap.playScratchingHead(Common::Point(4, 3));
 						break;
 					case GRAB_CURSOR:
 						gnap.playImpossible();
@@ -1859,15 +1859,15 @@ void Scene44::run() {
 
 			case kHS44Spring:
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS44Spring].x, _vm->_hotspotsWalkPos[kHS44Spring].y, 8, 0);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS44Spring], 8, 0);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						gnap.playScratchingHead(8, 7);
+						gnap.playScratchingHead(Common::Point(8, 7));
 						break;
 					case GRAB_CURSOR:
 						gnap.playPullOutDevice(Common::Point(8, 0));
-						gnap.playUseDevice(8, 0);
+						gnap.playUseDevice(Common::Point(8, 0));
 						_nextSpringGuySequenceId = 0xFB;
 						_vm->invAdd(kItemSpring);
 						_vm->setFlag(kGFSpringTaken);
@@ -1885,14 +1885,14 @@ void Scene44::run() {
 
 			case kHS44SpringGuy:
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS44SpringGuy].x, _vm->_hotspotsWalkPos[kHS44SpringGuy].y, 8, 0);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS44SpringGuy], 8, 0);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
 						if (_vm->isFlag(kGFSpringTaken))
 							gnap.playMoan1(Common::Point(8, 7));
 						else
-							gnap.playScratchingHead(8, 7);
+							gnap.playScratchingHead(Common::Point(8, 7));
 						break;
 					case TALK_CURSOR:
 						gnap._idleFacing = kDirUpRight;
@@ -2348,7 +2348,7 @@ void Scene45::run() {
 					} else {
 						switch (_vm->_verbCursor) {
 						case LOOK_CURSOR:
-							gnap.playScratchingHead(5, 0);
+							gnap.playScratchingHead(Common::Point(5, 0));
 							break;
 						case GRAB_CURSOR:
 						case TALK_CURSOR:
@@ -2629,7 +2629,7 @@ void Scene46::run() {
 
 			case kHS46SackGuy:
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS46SackGuy].x, _vm->_hotspotsWalkPos[kHS46SackGuy].y, 2, 0);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS46SackGuy], 2, 0);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
@@ -2650,7 +2650,7 @@ void Scene46::run() {
 
 			case kHS46ItchyGuy:
 				if (_vm->_grabCursorSpriteIndex >= 0) {
-					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS46ItchyGuy].x, _vm->_hotspotsWalkPos[kHS46ItchyGuy].y, 7, 0);
+					gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS46ItchyGuy], 7, 0);
 				} else {
 					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR: