GNAP: Refactor scene 3

3 files changed, 340 insertions, 280 deletions

diff --git a/engines/gnap/scenes/scene03.cpp b/engines/gnap/scenes/scene03.cpp
index 77a9adefaa..2bcbe40a8f 100644
--- a/engines/gnap/scenes/scene03.cpp
+++ b/engines/gnap/scenes/scene03.cpp
@@ -23,7 +23,7 @@
 #include "gnap/gnap.h"
 #include "gnap/gamesys.h"
 #include "gnap/resource.h"
-
+#include "gnap/scenes/scene03.h"
 namespace Gnap {
 
 enum {
@@ -51,113 +51,118 @@ enum {
 	kASGrabScaredPlatypus	= 8
 };
 
-int GnapEngine::scene03_init() {
-	_gameSys->setAnimation(0, 0, 0);
-	_gameSys->setAnimation(0, 0, 1);
-	_gameSys->setAnimation(0, 0, 5);
+Scene03::Scene03(GnapEngine *vm) : Scene(vm) {
+	_s03_nextPlatSequenceId = -1;
+	_s03_platypusScared = false;
+	_s03_platypusHypnotized = false;
+	_s03_nextFrogSequenceId = -1;
+	_s03_currFrogSequenceId = -1;
+}
+
+int Scene03::init() {
+	_vm->_gameSys->setAnimation(0, 0, 0);
+	_vm->_gameSys->setAnimation(0, 0, 1);
+	_vm->_gameSys->setAnimation(0, 0, 5);
 	return 0x1CC;
 }
 
-void GnapEngine::scene03_updateHotspots() {
-	setHotspot(kHSPlatypus, 0, 0, 0, 0, SF_DISABLED | SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	setHotspot(kHSGrass, 646, 408, 722, 458, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 9, 6);
-	setHotspot(kHSExitTruck, 218, 64, 371, 224, SF_EXIT_U_CURSOR | SF_WALKABLE, 4, 4);
-	setHotspot(kHSCreek, 187, 499, 319, 587, SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 3, 7);
-	setHotspot(kHSTrappedPlatypus, 450, 256, 661, 414, SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 2, 5);
-	setHotspot(kHSWalkAreas1, 0, 500, 300, 600);
-	setHotspot(kHSWalkAreas2, 300, 447, 800, 600);
-	setHotspot(kHSPlatypusWalkArea, 235, 0, 800, 600);
-	setHotspot(kHSWalkAreas3, 0, 0, 800, 354);
-	setDeviceHotspot(kHSDevice, -1, -1, -1, -1);
-	if (isFlag(kGFPlatypus))
-		_hotspots[kHSPlatypus]._flags = SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
-	if (isFlag(kGFGrassTaken))
-		_hotspots[kHSGrass]._flags = SF_WALKABLE | SF_DISABLED;
-	if (isFlag(kGFPlatypus))
-		_hotspots[kHSTrappedPlatypus]._flags = SF_DISABLED;
-	if (isFlag(kGFPlatypus) || _s03_platypusHypnotized)
-		_hotspots[kHSPlatypusWalkArea]._flags |= SF_WALKABLE;
-	_hotspotsCount = 10;
+void Scene03::updateHotspots() {
+	_vm->setHotspot(kHSPlatypus, 0, 0, 0, 0, SF_DISABLED | SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHSGrass, 646, 408, 722, 458, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 9, 6);
+	_vm->setHotspot(kHSExitTruck, 218, 64, 371, 224, SF_EXIT_U_CURSOR | SF_WALKABLE, 4, 4);
+	_vm->setHotspot(kHSCreek, 187, 499, 319, 587, SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 3, 7);
+	_vm->setHotspot(kHSTrappedPlatypus, 450, 256, 661, 414, SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 2, 5);
+	_vm->setHotspot(kHSWalkAreas1, 0, 500, 300, 600);
+	_vm->setHotspot(kHSWalkAreas2, 300, 447, 800, 600);
+	_vm->setHotspot(kHSPlatypusWalkArea, 235, 0, 800, 600);
+	_vm->setHotspot(kHSWalkAreas3, 0, 0, 800, 354);
+	_vm->setDeviceHotspot(kHSDevice, -1, -1, -1, -1);
+	if (_vm->isFlag(kGFPlatypus))
+		_vm->_hotspots[kHSPlatypus]._flags = SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
+	if (_vm->isFlag(kGFGrassTaken))
+		_vm->_hotspots[kHSGrass]._flags = SF_WALKABLE | SF_DISABLED;
+	if (_vm->isFlag(kGFPlatypus))
+		_vm->_hotspots[kHSTrappedPlatypus]._flags = SF_DISABLED;
+	if (_vm->isFlag(kGFPlatypus) || _s03_platypusHypnotized)
+		_vm->_hotspots[kHSPlatypusWalkArea]._flags |= SF_WALKABLE;
+	_vm->_hotspotsCount = 10;
 }
 
-void GnapEngine::scene03_run() {
-	playSound(0x10925, true);
-	
-	startSoundTimerC(7);
+void Scene03::run() {
+	_vm->playSound(0x10925, true);
+	_vm->startSoundTimerC(7);
 	
-	_gameSys->insertSequence(0x1CA, 251, 0, 0, kSeqLoop, 0, 0, 0);
-	_gameSys->insertSequence(0x1CB, 251, 0, 0, kSeqLoop, 0, 0, 0);
+	_vm->_gameSys->insertSequence(0x1CA, 251, 0, 0, kSeqLoop, 0, 0, 0);
+	_vm->_gameSys->insertSequence(0x1CB, 251, 0, 0, kSeqLoop, 0, 0, 0);
 	
 	_s03_platypusHypnotized = false;
 	
-	initGnapPos(3, 4, kDirBottomRight);
+	_vm->initGnapPos(3, 4, kDirBottomRight);
 	
-	_gameSys->insertSequence(0x1C6, 253, 0, 0, kSeqNone, 0, 0, 0);
+	_vm->_gameSys->insertSequence(0x1C6, 253, 0, 0, kSeqNone, 0, 0, 0);
 	
 	_s03_currFrogSequenceId = 0x1C6;
 	_s03_nextFrogSequenceId = -1;
-	_gameSys->setAnimation(0x1C6, 253, 2);
+	_vm->_gameSys->setAnimation(0x1C6, 253, 2);
 	
-	_timers[6] = getRandom(20) + 30;
-	_timers[4] = getRandom(100) + 300;
-	_timers[5] = getRandom(100) + 200;
+	_vm->_timers[6] = _vm->getRandom(20) + 30;
+	_vm->_timers[4] = _vm->getRandom(100) + 300;
+	_vm->_timers[5] = _vm->getRandom(100) + 200;
 	
-	if (isFlag(kGFPlatypus)) {
-		initPlatypusPos(5, 4, kDirNone);
+	if (_vm->isFlag(kGFPlatypus)) {
+		_vm->initPlatypusPos(5, 4, kDirNone);
 	} else {
-		_timers[1] = getRandom(40) + 20;
-		_gameSys->setAnimation(0x1C2, 99, 1);
-		_gameSys->insertSequence(0x1C2, 99, 0, 0, kSeqNone, 0, 0, 0);
-		_platypusSequenceId = 0x1C2;
-		_platypusSequenceDatNum = 0;
+		_vm->_timers[1] = _vm->getRandom(40) + 20;
+		_vm->_gameSys->setAnimation(0x1C2, 99, 1);
+		_vm->_gameSys->insertSequence(0x1C2, 99, 0, 0, kSeqNone, 0, 0, 0);
+		_vm->_platypusSequenceId = 0x1C2;
+		_vm->_platypusSequenceDatNum = 0;
 	}
 	
-	_gameSys->insertSequence(0x1C4, 255, 0, 0, kSeqNone, 0, 0, 0);
-	
-	if (!isFlag(kGFGrassTaken))
-		_gameSys->insertSequence(0x1B2, 253, 0, 0, kSeqNone, 0, 0, 0);
+	_vm->_gameSys->insertSequence(0x1C4, 255, 0, 0, kSeqNone, 0, 0, 0);
 	
-	queueInsertDeviceIcon();
+	if (!_vm->isFlag(kGFGrassTaken))
+		_vm->_gameSys->insertSequence(0x1B2, 253, 0, 0, kSeqNone, 0, 0, 0);
 	
-	endSceneInit();
+	_vm->queueInsertDeviceIcon();
 	
-	if (isFlag(kGFPlatypus))
-		platypusWalkTo(4, 7, -1, 0x107C2, 1);
-	gnapWalkTo(3, 6, -1, 0x107B9, 1);
+	_vm->endSceneInit();
 	
-	while (!_sceneDone) {
+	if (_vm->isFlag(kGFPlatypus))
+		_vm->platypusWalkTo(4, 7, -1, 0x107C2, 1);
+	_vm->gnapWalkTo(3, 6, -1, 0x107B9, 1);
 	
-		updateMouseCursor();
-		updateCursorByHotspot();
-	
-		_sceneClickedHotspot = getClickedHotspotId();
-		updateGrabCursorSprite(0, 0);
-	
-		switch (_sceneClickedHotspot) {
+	while (!_vm->_sceneDone) {
+		_vm->updateMouseCursor();
+		_vm->updateCursorByHotspot();
 
+		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
+		_vm->updateGrabCursorSprite(0, 0);
+	
+		switch (_vm->_sceneClickedHotspot) {
 		case kHSPlatypus:
-			if (_gnapActionStatus < 0 && isFlag(kGFPlatypus)) {
-				if (_grabCursorSpriteIndex == kItemDisguise) {
-					gnapUseDisguiseOnPlatypus();
-				} else if (_grabCursorSpriteIndex >= 0) {
-					playGnapImpossible(0, 0);
+			if (_vm->_gnapActionStatus < 0 && _vm->isFlag(kGFPlatypus)) {
+				if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
+					_vm->gnapUseDisguiseOnPlatypus();
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapImpossible(0, 0);
 				} else {
-					switch (_verbCursor) {
+					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						if (isFlag(kGFKeysTaken))
-							playGnapMoan1(_platX, _platY);
+						if (_vm->isFlag(kGFKeysTaken))
+							_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
 						else
-							playGnapScratchingHead(_platX, _platY);
+							_vm->playGnapScratchingHead(_vm->_platX, _vm->_platY);
 						break;
 					case GRAB_CURSOR:
-						gnapKissPlatypus(0);
+						_vm->gnapKissPlatypus(0);
 						break;
 					case TALK_CURSOR:
-						playGnapBrainPulsating(_platX, _platY);
-						playPlatypusSequence(getPlatypusSequenceId());
+						_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
+						_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
-						playGnapImpossible(0, 0);
+						_vm->playGnapImpossible(0, 0);
 						break;
 					}
 				}
@@ -165,26 +170,26 @@ void GnapEngine::scene03_run() {
 			break;
 
 		case kHSGrass:
-			if (_gnapActionStatus < 0) {
-				if (isFlag(kGFGrassTaken)) {
-					gnapWalkTo(-1, -1, -1, -1, 1);
-				} else if (_grabCursorSpriteIndex >= 0) {
-					playGnapShowItem(_grabCursorSpriteIndex, 9, 6);
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->isFlag(kGFGrassTaken)) {
+					_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 9, 6);
 				} else {
-					switch (_verbCursor) {
+					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						playGnapScratchingHead(9, 6);
+						_vm->playGnapScratchingHead(9, 6);
 						break;
 					case GRAB_CURSOR:
-						playGnapPullOutDevice(9, 6);
-						playGnapUseDevice(0, 0);
-						_gameSys->insertSequence(0x1B3, 253, 0x1B2, 253, kSeqSyncWait, 0, 0, 0);
-						_gameSys->setAnimation(0x1B3, 253, 5);
-						_hotspots[kHSGrass]._flags |= SF_WALKABLE | SF_DISABLED;
+						_vm->playGnapPullOutDevice(9, 6);
+						_vm->playGnapUseDevice(0, 0);
+						_vm->_gameSys->insertSequence(0x1B3, 253, 0x1B2, 253, kSeqSyncWait, 0, 0, 0);
+						_vm->_gameSys->setAnimation(0x1B3, 253, 5);
+						_vm->_hotspots[kHSGrass]._flags |= SF_WALKABLE | SF_DISABLED;
 						break;
 					case TALK_CURSOR:
 					case PLAT_CURSOR:
-						playGnapImpossible(0, 0);
+						_vm->playGnapImpossible(0, 0);
 						break;
 					}
 				}
@@ -192,41 +197,41 @@ void GnapEngine::scene03_run() {
 			break;
 
 		case kHSExitTruck:
-			if (_gnapActionStatus < 0) {
-				_isLeavingScene = true;
-				_hotspots[kHSPlatypusWalkArea]._flags |= SF_WALKABLE;
-				gnapWalkTo(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, 0, 0x107AD, 1);
-				_gnapActionStatus = kASLeaveScene;
-				if (isFlag(kGFPlatypus))
-					platypusWalkTo(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, -1, 0x107C2, 1);
-				_hotspots[kHSPlatypusWalkArea]._flags &= ~SF_WALKABLE;
-				if (_cursorValue == 1)
-					_newSceneNum = 2;
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->_isLeavingScene = true;
+				_vm->_hotspots[kHSPlatypusWalkArea]._flags |= SF_WALKABLE;
+				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, 0x107AD, 1);
+				_vm->_gnapActionStatus = kASLeaveScene;
+				if (_vm->isFlag(kGFPlatypus))
+					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, -1, 0x107C2, 1);
+				_vm->_hotspots[kHSPlatypusWalkArea]._flags &= ~SF_WALKABLE;
+				if (_vm->_cursorValue == 1)
+					_vm->_newSceneNum = 2;
 				else
-					_newSceneNum = 33;
+					_vm->_newSceneNum = 33;
 			}
 			break;
 
 		case kHSCreek:
-			if (_gnapActionStatus == -1) {
-				if (_grabCursorSpriteIndex >= 0) {
-					playGnapImpossible(0, 0);
+			if (_vm->_gnapActionStatus == -1) {
+				if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapImpossible(0, 0);
 				} else {
-					switch (_verbCursor) {
+					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						playGnapMoan2(2, 8);
+						_vm->playGnapMoan2(2, 8);
 						break;
 					case GRAB_CURSOR:
-						if (!isFlag(kGFPlatypus))
-							_hotspots[kHSPlatypusWalkArea]._flags |= SF_WALKABLE;
-						if (gnapWalkTo(_hotspotsWalkPos[3].x, _hotspotsWalkPos[3].y, 0, getGnapSequenceId(gskIdle, _hotspotsWalkPos[3].x + 1, _hotspotsWalkPos[3].y + 1) | 0x10000, 1))
-							_gnapActionStatus = kASGrabCreek;
-						if (!isFlag(kGFPlatypus))
-							_hotspots[kHSPlatypusWalkArea]._flags &= ~SF_WALKABLE;
+						if (!_vm->isFlag(kGFPlatypus))
+							_vm->_hotspots[kHSPlatypusWalkArea]._flags |= SF_WALKABLE;
+						if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, _vm->_hotspotsWalkPos[3].x + 1, _vm->_hotspotsWalkPos[3].y + 1) | 0x10000, 1))
+							_vm->_gnapActionStatus = kASGrabCreek;
+						if (!_vm->isFlag(kGFPlatypus))
+							_vm->_hotspots[kHSPlatypusWalkArea]._flags &= ~SF_WALKABLE;
 						break;
 					case TALK_CURSOR:
 					case PLAT_CURSOR:
-						playGnapImpossible(0, 0);
+						_vm->playGnapImpossible(0, 0);
 						break;
 					}
 				}
@@ -234,42 +239,42 @@ void GnapEngine::scene03_run() {
 			break;
 
 		case kHSTrappedPlatypus:
-			if (_gnapActionStatus < 0) {
-				if (isFlag(kGFPlatypus)) {
-					gnapWalkTo(-1, -1, -1, -1, 1);
-				} else if (_grabCursorSpriteIndex >= 0) {
-					playGnapShowItem(_grabCursorSpriteIndex, 8, 4);
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->isFlag(kGFPlatypus)) {
+					_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 8, 4);
 				} else {
-					switch (_verbCursor) {
+					switch (_vm->_verbCursor) {
 					case LOOK_CURSOR:
-						playGnapScratchingHead(8, 4);
+						_vm->playGnapScratchingHead(8, 4);
 						break;
 					case GRAB_CURSOR:
 						if (_s03_platypusHypnotized) {
-							gnapWalkTo(7, 6, 0, 0x107B5, 1);
-							_gnapActionStatus = kASFreePlatypus;
+							_vm->gnapWalkTo(7, 6, 0, 0x107B5, 1);
+							_vm->_gnapActionStatus = kASFreePlatypus;
 						} else {
-							gnapWalkTo(_hotspotsWalkPos[4].x, _hotspotsWalkPos[4].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
+							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
 							if (_s03_platypusScared)
-								_gnapActionStatus = kASGrabScaredPlatypus;
+								_vm->_gnapActionStatus = kASGrabScaredPlatypus;
 							else
-								_gnapActionStatus = kASGrabPlatypus;
+								_vm->_gnapActionStatus = kASGrabPlatypus;
 						}
 						break;
 					case TALK_CURSOR:
 						if (_s03_platypusHypnotized) {
-							playGnapBrainPulsating(8, 4);
+							_vm->playGnapBrainPulsating(8, 4);
 						} else {
-							_gnapIdleFacing = kDirBottomRight;
-							gnapWalkTo(_hotspotsWalkPos[4].x, _hotspotsWalkPos[4].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
+							_vm->_gnapIdleFacing = kDirBottomRight;
+							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
 							if (_s03_platypusScared)
-								_gnapActionStatus = kASHypnotizeScaredPlat;
+								_vm->_gnapActionStatus = kASHypnotizeScaredPlat;
 							else
-								_gnapActionStatus = kASHypnotizePlat;
+								_vm->_gnapActionStatus = kASHypnotizePlat;
 						}
 						break;
 					case PLAT_CURSOR:
-						playGnapImpossible(0, 0);
+						_vm->playGnapImpossible(0, 0);
 						break;
 					}
 				}
@@ -277,160 +282,157 @@ void GnapEngine::scene03_run() {
 			break;
 
 		case kHSDevice:
-			if (_gnapActionStatus < 0) {
-				runMenu();
-				scene03_updateHotspots();
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->runMenu();
+				updateHotspots();
 			}
 			break;
 
 		case kHSWalkAreas1:
 		case kHSWalkAreas2:
 		case kHSWalkAreas3:
-			if (_gnapActionStatus < 0)
-				gnapWalkTo(-1, -1, -1, -1, 1);
+			if (_vm->_gnapActionStatus < 0)
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
 
 		case kHSPlatypusWalkArea:
-			if (_gnapActionStatus < 0) {
-				if (isFlag(kGFPlatypus) || _s03_platypusHypnotized) {
-					gnapWalkTo(-1, -1, -1, -1, 1);
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->isFlag(kGFPlatypus) || _s03_platypusHypnotized) {
+					_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 				} else {
-					gnapWalkTo(_hotspotsWalkPos[4].x, _hotspotsWalkPos[4].y, 0, 0x107B5, 1);
+					_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107B5, 1);
 					if (_s03_platypusScared)
-						_gnapActionStatus = kASGrabScaredPlatypus;
+						_vm->_gnapActionStatus = kASGrabScaredPlatypus;
 					else
-						_gnapActionStatus = kASGrabPlatypus;
+						_vm->_gnapActionStatus = kASGrabPlatypus;
 				}
 			}
 			break;
 			
 		default:
-			if (_mouseClickState._left && _gnapActionStatus < 0) {
-				gnapWalkTo(-1, -1, -1, -1, 1);
-				_mouseClickState._left = false;
+			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+				_vm->_mouseClickState._left = false;
 			}
 			break;
 			
 		}
 
-		scene03_updateAnimations();
+		updateAnimations();
 	
-		if (!isSoundPlaying(0x10925))
-			playSound(0x10925, true);
+		if (!_vm->isSoundPlaying(0x10925))
+			_vm->playSound(0x10925, true);
 	
-		if (!_isLeavingScene) {
-			if (_platypusActionStatus < 0 && isFlag(kGFPlatypus))
-				updatePlatypusIdleSequence();
-			if (_gnapActionStatus < 0)
-				updateGnapIdleSequence();
-			if (!_timers[1] && !_s03_platypusScared) {
-				_timers[1] = getRandom(40) + 20;
-				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && !isFlag(kGFPlatypus) && !_s03_platypusHypnotized)
+		if (!_vm->_isLeavingScene) {
+			if (_vm->_platypusActionStatus < 0 && _vm->isFlag(kGFPlatypus))
+				_vm->updatePlatypusIdleSequence();
+			if (_vm->_gnapActionStatus < 0)
+				_vm->updateGnapIdleSequence();
+			if (!_vm->_timers[1] && !_s03_platypusScared) {
+				_vm->_timers[1] = _vm->getRandom(40) + 20;
+				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0 && !_vm->isFlag(kGFPlatypus) && !_s03_platypusHypnotized)
 					_s03_nextPlatSequenceId = 450;
 			}
-			if (!_timers[6]) {
-				_timers[6] = getRandom(20) + 30;
-				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && _s03_nextFrogSequenceId == -1) {
-					if (getRandom(5) == 1)
+			if (!_vm->_timers[6]) {
+				_vm->_timers[6] = _vm->getRandom(20) + 30;
+				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0 && _s03_nextFrogSequenceId == -1) {
+					if (_vm->getRandom(5) == 1)
 						_s03_nextFrogSequenceId = 0x1C6;
 					else
 						_s03_nextFrogSequenceId = 0x1C7;
 				}
 			}
-			if (!_timers[4]) {
+			if (!_vm->_timers[4]) {
 				// Update bird animation
-				_timers[4] = getRandom(100) + 300;
-				if (_gnapActionStatus < 0 && _platypusActionStatus < 0)
-					_gameSys->insertSequence(getRandom(2) != 0 ? 0x1C8 : 0x1C3, 253, 0, 0, kSeqNone, 0, 0, 0);
+				_vm->_timers[4] = _vm->getRandom(100) + 300;
+				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0)
+					_vm->_gameSys->insertSequence(_vm->getRandom(2) != 0 ? 0x1C8 : 0x1C3, 253, 0, 0, kSeqNone, 0, 0, 0);
 			}
-			if (!_timers[5]) {
-				_timers[5] = getRandom(100) + 200;
-				if (_gnapActionStatus < 0 && _platypusActionStatus < 0) {
-					_gameSys->setAnimation(0x1C5, 253, 4);
-					_gameSys->insertSequence(0x1C5, 253, 0, 0, kSeqNone, 0, 0, 0);
+			if (!_vm->_timers[5]) {
+				_vm->_timers[5] = _vm->getRandom(100) + 200;
+				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0) {
+					_vm->_gameSys->setAnimation(0x1C5, 253, 4);
+					_vm->_gameSys->insertSequence(0x1C5, 253, 0, 0, kSeqNone, 0, 0, 0);
 				}
 			}
-			playSoundC();
+			_vm->playSoundC();
 		}
 	
-		checkGameKeys();
+		_vm->checkGameKeys();
 	
-		if (isKeyStatus1(8)) {
-			clearKeyStatus1(8);
-			runMenu();
-			scene03_updateHotspots();
-			_timers[5] = getRandom(100) + 200;
-			_timers[4] = getRandom(100) + 300;
-			_timers[6] = getRandom(20) + 30;
+		if (_vm->isKeyStatus1(8)) {
+			_vm->clearKeyStatus1(8);
+			_vm->runMenu();
+			updateHotspots();
+			_vm->_timers[5] = _vm->getRandom(100) + 200;
+			_vm->_timers[4] = _vm->getRandom(100) + 300;
+			_vm->_timers[6] = _vm->getRandom(20) + 30;
 		}
 		
-		gameUpdateTick();
-	
+		_vm->gameUpdateTick();
 	}
-
 }
 
-void GnapEngine::scene03_updateAnimations() {
-
-	if (_gameSys->getAnimationStatus(0) == 2) {
-		_gameSys->setAnimation(0, 0, 0);
-		switch (_gnapActionStatus) {
+void Scene03::updateAnimations() {
+	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 0);
+		switch (_vm->_gnapActionStatus) {
 		case kASLeaveScene:
-			_sceneDone = true;
+			_vm->_sceneDone = true;
 			break;
 		case kASFreePlatypus:
 			_s03_nextPlatSequenceId = 0x1BC;
 			break;
 		case kASFreePlatypusDone:
-			_gnapActionStatus = -1;
-			_platX = 6;
-			_platY = 6;
-			_platypusFacing = kDirUnk4;
-			_platypusId = 120;
-			_gameSys->insertSequence(0x107CA, _platypusId, 0x1BC, 99,
-				kSeqSyncWait, 0, 75 * _platX - _platGridX, 48 * _platY - _platGridY);
-			_gameSys->insertSequence(0x1B7, 99, 0, 0, kSeqNone, 0, 0, 0);
-			_platypusSequenceDatNum = 1;
-			_platypusSequenceId = 0x7CA;
-			setFlag(kGFPlatypus);
+			_vm->_gnapActionStatus = -1;
+			_vm->_platX = 6;
+			_vm->_platY = 6;
+			_vm->_platypusFacing = kDirUnk4;
+			_vm->_platypusId = 120;
+			_vm->_gameSys->insertSequence(0x107CA, _vm->_platypusId, 0x1BC, 99,
+				kSeqSyncWait, 0, 75 * _vm->_platX - _vm->_platGridX, 48 * _vm->_platY - _vm->_platGridY);
+			_vm->_gameSys->insertSequence(0x1B7, 99, 0, 0, kSeqNone, 0, 0, 0);
+			_vm->_platypusSequenceDatNum = 1;
+			_vm->_platypusSequenceId = 0x7CA;
+			_vm->setFlag(kGFPlatypus);
 			_s03_nextPlatSequenceId = -1;
-			scene03_updateHotspots();
+			updateHotspots();
 			break;
 		case kASHypnotizePlat:
-			playGnapBrainPulsating(0, 0);
-			addFullScreenSprite(0x106, 255);
-			_gameSys->setAnimation(0x1C9, 256, 1);
-			_gameSys->insertSequence(0x1C9, 256, 0, 0, kSeqNone, 0, 0, 0);
-			while (_gameSys->getAnimationStatus(1) != 2)
-				gameUpdateTick();
-			removeFullScreenSprite();
-			_gameSys->setAnimation(0x1BA, 99, 1);
-			_gameSys->insertSequence(0x1BA, 99, _platypusSequenceId | (_platypusSequenceDatNum << 16), 99, kSeqSyncExists, 0, 0, 0);
-			_platypusSequenceDatNum = 0;
-			_platypusSequenceId = 0x1BA;
-			_gnapActionStatus = -1;
+			_vm->playGnapBrainPulsating(0, 0);
+			_vm->addFullScreenSprite(0x106, 255);
+			_vm->_gameSys->setAnimation(0x1C9, 256, 1);
+			_vm->_gameSys->insertSequence(0x1C9, 256, 0, 0, kSeqNone, 0, 0, 0);
+			while (_vm->_gameSys->getAnimationStatus(1) != 2)
+				_vm->gameUpdateTick();
+			_vm->removeFullScreenSprite();
+			_vm->_gameSys->setAnimation(0x1BA, 99, 1);
+			_vm->_gameSys->insertSequence(0x1BA, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncExists, 0, 0, 0);
+			_vm->_platypusSequenceDatNum = 0;
+			_vm->_platypusSequenceId = 0x1BA;
+			_vm->_gnapActionStatus = -1;
 			_s03_platypusHypnotized = true;
-			scene03_updateHotspots();
+			updateHotspots();
 			break;
 		case kASHypnotizeScaredPlat:
-			playGnapBrainPulsating(0, 0);
-			_gameSys->insertSequence(0x1BF, 99, _platypusSequenceId | (_platypusSequenceDatNum << 16), 99, kSeqSyncExists, 0, 0, 0);
-			_gameSys->setAnimation(0x1BF, 99, 1);
-			while (_gameSys->getAnimationStatus(1) != 2)
-				gameUpdateTick();
-			addFullScreenSprite(0x106, 255);
-			_gameSys->setAnimation(0x1C9, 256, 1);
-			_gameSys->insertSequence(0x1C9, 256, 0, 0, kSeqNone, 0, 0, 0);
-			while (_gameSys->getAnimationStatus(1) != 2)
-				gameUpdateTick();
-			removeFullScreenSprite();
-			_gameSys->setAnimation(0x1BA, 99, 1);
-			_gameSys->insertSequence(0x1BA, 99, 447, 99, kSeqSyncWait, 0, 0, 0);
-			_platypusSequenceDatNum = 0;
-			_platypusSequenceId = 0x1BA;
-			_gnapActionStatus = -1;
+			_vm->playGnapBrainPulsating(0, 0);
+			_vm->_gameSys->insertSequence(0x1BF, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncExists, 0, 0, 0);
+			_vm->_gameSys->setAnimation(0x1BF, 99, 1);
+			while (_vm->_gameSys->getAnimationStatus(1) != 2)
+				_vm->gameUpdateTick();
+			_vm->addFullScreenSprite(0x106, 255);
+			_vm->_gameSys->setAnimation(0x1C9, 256, 1);
+			_vm->_gameSys->insertSequence(0x1C9, 256, 0, 0, kSeqNone, 0, 0, 0);
+			while (_vm->_gameSys->getAnimationStatus(1) != 2)
+				_vm->gameUpdateTick();
+			_vm->removeFullScreenSprite();
+			_vm->_gameSys->setAnimation(0x1BA, 99, 1);
+			_vm->_gameSys->insertSequence(0x1BA, 99, 447, 99, kSeqSyncWait, 0, 0, 0);
+			_vm->_platypusSequenceDatNum = 0;
+			_vm->_platypusSequenceId = 0x1BA;
+			_vm->_gnapActionStatus = -1;
 			_s03_platypusHypnotized = true;
-			scene03_updateHotspots();
+			updateHotspots();
 			break;
 		case kASGrabPlatypus:
 			_s03_nextPlatSequenceId = 0x1BD;
@@ -441,76 +443,75 @@ void GnapEngine::scene03_updateAnimations() {
 			_s03_platypusHypnotized = false;
 			break;
 		case kASGrabCreek:
-			_gameSys->insertSequence(0x1B4, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0);
-			_gameSys->setAnimation(0x1B4, _gnapId, 0);
-			_gnapSequenceId = 0x1B4;
-			_gnapSequenceDatNum = 0;
-			_gnapActionStatus = kASGrabCreekDone;
+			_vm->_gameSys->insertSequence(0x1B4, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->setAnimation(0x1B4, _vm->_gnapId, 0);
+			_vm->_gnapSequenceId = 0x1B4;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapActionStatus = kASGrabCreekDone;
 			break;
 		default:
-			_gnapActionStatus = -1;
+			_vm->_gnapActionStatus = -1;
 			break;
 		}
 	}
 	
-	if (_gameSys->getAnimationStatus(1) == 2) {
+	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
 		if (_s03_nextPlatSequenceId == 0x1BD || _s03_nextPlatSequenceId == 0x1C0) {
-			_gameSys->setAnimation(0, 0, 1);
+			_vm->_gameSys->setAnimation(0, 0, 1);
 			_s03_platypusScared = true;
-			_gameSys->insertSequence(0x1B5, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0);
-			_gameSys->insertSequence(_s03_nextPlatSequenceId, 99, _platypusSequenceId | (_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
-			_gnapSequenceId = 0x1B5;
-			_gnapSequenceDatNum = 0;
-			_gnapIdleFacing = kDirNone;
-			_platypusSequenceId = _s03_nextPlatSequenceId;
-			_platypusSequenceDatNum = 0;
-			_gameSys->setAnimation(_s03_nextPlatSequenceId, 99, 1);
+			_vm->_gameSys->insertSequence(0x1B5, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->insertSequence(_s03_nextPlatSequenceId, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
+			_vm->_gnapSequenceId = 0x1B5;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapIdleFacing = kDirNone;
+			_vm->_platypusSequenceId = _s03_nextPlatSequenceId;
+			_vm->_platypusSequenceDatNum = 0;
+			_vm->_gameSys->setAnimation(_s03_nextPlatSequenceId, 99, 1);
 			_s03_nextPlatSequenceId = -1;
-			_gnapActionStatus = -1;
+			_vm->_gnapActionStatus = -1;
 		} else if (_s03_nextPlatSequenceId == 0x1BC) {
-			_gnapX = 3;
-			_gnapY = 6;
-			_gameSys->insertSequence(0x1B6, 120, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0);
-			_gameSys->insertSequence(0x1BC, 99, _platypusSequenceId | (_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
-			_gameSys->setAnimation(0x1BC, 99, 0);
-			_gnapId = 20 * _gnapY;
-			_gnapSequenceId = 0x1B6;
-			_gnapSequenceDatNum = 0;
-			_gnapIdleFacing = kDirNone;
-			_gnapActionStatus = kASFreePlatypusDone;
+			_vm->_gnapX = 3;
+			_vm->_gnapY = 6;
+			_vm->_gameSys->insertSequence(0x1B6, 120, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0x1BC, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->setAnimation(0x1BC, 99, 0);
+			_vm->_gnapId = 20 * _vm->_gnapY;
+			_vm->_gnapSequenceId = 0x1B6;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapIdleFacing = kDirNone;
+			_vm->_gnapActionStatus = kASFreePlatypusDone;
 			_s03_nextPlatSequenceId = -1;
 		} else if (_s03_nextPlatSequenceId == 0x1C2 && !_s03_platypusScared) {
-			_gameSys->setAnimation(0, 0, 1);
-			_gameSys->insertSequence(0x1C2, 99, _platypusSequenceId | (_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
-			_platypusSequenceId = 0x1C2;
-			_platypusSequenceDatNum = 0;
-			_gameSys->setAnimation(0x1C2, 99, 1);
+			_vm->_gameSys->setAnimation(0, 0, 1);
+			_vm->_gameSys->insertSequence(0x1C2, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
+			_vm->_platypusSequenceId = 0x1C2;
+			_vm->_platypusSequenceDatNum = 0;
+			_vm->_gameSys->setAnimation(0x1C2, 99, 1);
 			_s03_nextPlatSequenceId = -1;
 		} else if (_s03_nextPlatSequenceId == -1 && _s03_platypusScared && !_s03_platypusHypnotized) {
-			_gameSys->setAnimation(0, 0, 1);
-			_gameSys->setAnimation(0x1BE, 99, 1);
-			_gameSys->insertSequence(0x1BE, 99, _platypusSequenceId | (_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
-			_platypusSequenceId = 0x1BE;
-			_platypusSequenceDatNum = 0;
+			_vm->_gameSys->setAnimation(0, 0, 1);
+			_vm->_gameSys->setAnimation(0x1BE, 99, 1);
+			_vm->_gameSys->insertSequence(0x1BE, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
+			_vm->_platypusSequenceId = 0x1BE;
+			_vm->_platypusSequenceDatNum = 0;
 			_s03_nextPlatSequenceId = -1;
 		}
 	}
 	
-	if (_gameSys->getAnimationStatus(2) == 2 && _s03_nextFrogSequenceId != -1) {
-		_gameSys->setAnimation(_s03_nextFrogSequenceId, 253, 2);
-		_gameSys->insertSequence(_s03_nextFrogSequenceId, 253, _s03_currFrogSequenceId, 253, kSeqSyncWait, 0, 0, 0);
+	if (_vm->_gameSys->getAnimationStatus(2) == 2 && _s03_nextFrogSequenceId != -1) {
+		_vm->_gameSys->setAnimation(_s03_nextFrogSequenceId, 253, 2);
+		_vm->_gameSys->insertSequence(_s03_nextFrogSequenceId, 253, _s03_currFrogSequenceId, 253, kSeqSyncWait, 0, 0, 0);
 		_s03_currFrogSequenceId = _s03_nextFrogSequenceId;
 		_s03_nextFrogSequenceId = -1;
 	}
 	
-	if (_gameSys->getAnimationStatus(5) == 2) {
-		_gameSys->setAnimation(0, 0, 5);
-		invAdd(kItemGrass);
-		setGrabCursorSprite(kItemGrass);
-		setFlag(kGFGrassTaken);
-		scene03_updateHotspots();
+	if (_vm->_gameSys->getAnimationStatus(5) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 5);
+		_vm->invAdd(kItemGrass);
+		_vm->setGrabCursorSprite(kItemGrass);
+		_vm->setFlag(kGFGrassTaken);
+		updateHotspots();
 	}
-
 }
 
 } // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene03.h b/engines/gnap/scenes/scene03.h
new file mode 100644
index 0000000000..2ccb1cd542
--- /dev/null
+++ b/engines/gnap/scenes/scene03.h
@@ -0,0 +1,53 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef GNAP_SCENE03_H
+#define GNAP_SCENE03_H
+
+#include "gnap/debugger.h"
+#include "gnap/scenes/scenecore.h"
+
+namespace Gnap {
+
+class GnapEngine;
+
+class Scene03: public Scene {
+public:
+	Scene03(GnapEngine *vm);
+	~Scene03() {}
+
+	virtual int init();
+	virtual void updateHotspots();
+	virtual void run();
+	virtual void updateAnimations();
+
+private:
+	bool _s03_platypusHypnotized;	
+	bool _s03_platypusScared;
+	int _s03_nextPlatSequenceId;
+	int _s03_nextFrogSequenceId;
+	int _s03_currFrogSequenceId;
+};
+
+} // End of namespace Gnap
+
+#endif // GNAP_SCENE03_H
diff --git a/engines/gnap/scenes/scenecore.cpp b/engines/gnap/scenes/scenecore.cpp
index 7d37793e48..e88843d9ec 100644
--- a/engines/gnap/scenes/scenecore.cpp
+++ b/engines/gnap/scenes/scenecore.cpp
@@ -27,11 +27,12 @@
 
 #include "gnap/scenes/scene00.h"
 #include "gnap/scenes/scene01.h"
+#include "gnap/scenes/scene02.h"
+#include "gnap/scenes/scene03.h"
 
 namespace Gnap {
 
 int GnapEngine::initSceneLogic() {
-
 	int backgroundId = -1;
 
 	switch (_currentSceneNum) {
@@ -48,14 +49,16 @@ int GnapEngine::initSceneLogic() {
 		initSceneGrid(21, 146, 11, 10);
 		break;
 	case 2:
+		_scene = new Scene02(this);
 		backgroundId = _scene->init();
 		_scene->updateHotspots();
 		_gameSys->setScaleValues(0, 500, 1, 1000);
 		initSceneGrid(21, 146, 11, 10);
 		break;
 	case 3:
-		backgroundId = scene03_init();
-		scene03_updateHotspots();
+		_scene = new Scene03(this);
+		backgroundId = _scene->init();
+		_scene->updateHotspots();
 		_gameSys->setScaleValues(0, 500, 1, 1000);
 		initSceneGrid(21, 146, 11, 10);
 		break;
@@ -239,8 +242,9 @@ int GnapEngine::initSceneLogic() {
 		initSceneGrid(21, 146, 11, 10);
 		break;
 	case 34:
-		backgroundId = scene03_init();
-		scene03_updateHotspots();
+		_scene = new Scene03(this);
+		backgroundId = _scene->init();
+		_scene->updateHotspots();
 		_gameSys->setScaleValues(0, 500, 1, 1000);
 		initSceneGrid(21, 146, 11, 10);
 		break;
@@ -369,7 +373,8 @@ void GnapEngine::runSceneLogic() {
 			_newSceneNum = 4;
 		break;
 	case 3:
-		scene03_run();
+		_scene->run();
+		delete _scene;
 		if (_newSceneNum == 55)
 			_newSceneNum = 4;
 		break;
@@ -525,7 +530,8 @@ void GnapEngine::runSceneLogic() {
 			_newSceneNum = 37;
 		break;
 	case 34:
-		scene03_run();
+		_scene->run();
+		delete _scene;
 		if (_newSceneNum == 55)
 			_newSceneNum = 37;
 		break;