GNAP: Janitorial - Remove trailing spaces and tabs

11 files changed, 624 insertions, 624 deletions

diff --git a/engines/gnap/scenes/arcade.cpp b/engines/gnap/scenes/arcade.cpp
index 3b1b1b0807..a857427f3d 100644
--- a/engines/gnap/scenes/arcade.cpp
+++ b/engines/gnap/scenes/arcade.cpp
@@ -357,7 +357,7 @@ void Scene49::run() {
 
 	_truckId = 256;
 	_vm->_timers[3] = 35;
-	
+
 	while (!_vm->_sceneDone) {
 		if (_vm->_timers[0] == 0) {
 			// Update background animations (clouds etc.)
@@ -503,7 +503,7 @@ void Scene49::run() {
 		}
 		_vm->gameUpdateTick();
 	}
-	_vm->stopSound(0xE2);  
+	_vm->stopSound(0xE2);
 }
 
 void Scene49::updateAnimations() {
@@ -670,7 +670,7 @@ void Scene50::playTonguesIdle() {
 
 void Scene50::playRoundAnim(int roundNum) {
 	int sequenceId = 0;
-	
+
 	switch (roundNum) {
 	case 1:
 		sequenceId = 0xAF;
@@ -736,7 +736,7 @@ int Scene50::checkInput() {
 		_vm->clearKeyStatus1(Common::KEYCODE_ESCAPE);
 		_fightDone = true;
 	}
-	
+
 	return sequenceId;
 }
 
@@ -893,7 +893,7 @@ int Scene50::getRightTongueNextId() {
 
 void Scene50::playWinBadgeAnim(int tongueNum) {
 	int sequenceId;
-	
+
 	if (tongueNum == 1) {
 		if (_leftTongueRoundsWon == 1)
 	  		sequenceId = 0xC3;
@@ -983,7 +983,7 @@ void Scene50::run() {
 	}
 
 	// freeFont();
-	
+
 	_vm->_gameSys->setAnimation(0, 0, 7);
 	_vm->_gameSys->setAnimation(0, 0, 6);
 	_vm->_gameSys->setAnimation(0, 0, 5);
@@ -1243,10 +1243,10 @@ int Scene51::checkCollision(int sequenceId) {
 	bool checkFl = false;
 	for (int i = 0; i < 6; i++)
 		checkFl |= _items[i]._isCollision;
-		
+
 	if (!checkFl)
 		return false;
-		
+
 	if (isJumpingRight(sequenceId)) {
 		v8 = getPosRight(sequenceId);
 		v4 = getPosRight(sequenceId + 1);
@@ -1565,7 +1565,7 @@ void Scene51::updateGuyAnimation() {
 			_guyNextSequenceId = 0xC7;
 			break;
 		}
-	
+
 		_vm->_gameSys->insertSequence(_guyNextSequenceId, 39, _guySequenceId, 39, kSeqSyncWait, 0, 0, 0);
 		_guySequenceId = _guyNextSequenceId;
 		_guyNextSequenceId = -1;
@@ -2203,7 +2203,7 @@ void Scene52::updateAlienRow(int rowNum) {
 
 void Scene52::moveDownAlienRow() {
 	int v2[5], v3, v1, v0, v4;
-	
+
 	for (int i = 0; i < 5; ++i)
 		v2[i] = _items[0][i];
 
@@ -2238,7 +2238,7 @@ void Scene52::moveDownAlienRow() {
 
 int Scene52::updateHitAlien() {
 	int result = 0, rowNum, ya;
-	
+
 	int y = _shipCannonTopY - _shipCannonPosY;
 
 	if (y == 26) {
@@ -2262,7 +2262,7 @@ int Scene52::updateHitAlien() {
 			result = 1;
 		}
 	}
-	
+
 	return result;
 }
 
@@ -2309,7 +2309,7 @@ int Scene52::getHitAlienNum(int rowNum) {
 
 int Scene52::alienCannonHitShip(int cannonNum) {
 	int result = 0;
-	
+
 	if (_aliensCount) {
 		result = 0;
 	} else {
@@ -2332,7 +2332,7 @@ int Scene52::alienCannonHitShip(int cannonNum) {
 
 int Scene52::alienCannonHitShield(int cannonNum) {
 	int result = 0;
-	
+
 	int v3 = _alienCannonPosY[cannonNum] + 39;
 	if (_arcadeScreenBottom - 44 > v3)
 		return 0;
@@ -2361,7 +2361,7 @@ int Scene52::alienCannonHitShield(int cannonNum) {
 			return 0;
 		shieldNum = 2;
 	}
-	
+
 	if (_shieldSpriteIds[shieldNum] == -1) {
 		result = 0;
 	} else {
@@ -2383,7 +2383,7 @@ int Scene52::alienCannonHitShield(int cannonNum) {
 
 bool Scene52::shipCannonHitShield(int cannonNum) {
 	bool result = false;
-	
+
 	if (_shipCannonPosX < _shieldPosX[0])
 		return result;
 
@@ -2426,7 +2426,7 @@ bool Scene52::shipCannonHitShield(int cannonNum) {
 
 bool Scene52::shipCannonHitAlien() {
 	bool result = false;
-	
+
 	if (_aliensCount || checkAlienRow(0))
 		return false;
 
@@ -2621,7 +2621,7 @@ void Scene52::drawScore(int score) {
 
 void Scene52::run() {
 	_vm->_timers[1] = 0;
-	
+
 	_vm->hideCursor();
 
 	// TODO loadFont("maturasc", "Matura MT Script Capitals", 2000);
@@ -2710,9 +2710,9 @@ void Scene52::run() {
 				break;
 			}
 		}
-		
+
 		update();
-		
+
 		if (clearKeyStatus()) {
 			_alienWave = false;
 			_vm->_gameSys->waitForUpdate();
diff --git a/engines/gnap/scenes/arcade.h b/engines/gnap/scenes/arcade.h
index 4255a2d6b0..b99d26158f 100644
--- a/engines/gnap/scenes/arcade.h
+++ b/engines/gnap/scenes/arcade.h
@@ -225,7 +225,7 @@ private:
 	int _shipPosX;
 	int _shipCannonPosX, _shipCannonPosY;
 	bool _shipCannonFiring;
-	bool _shipCannonFired; 
+	bool _shipCannonFired;
 	int _shipCannonWidth, _shipCannonHeight;
 	int _shipCannonTopY;
 	int _shipMidX, _shipMidY;
diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp
index 2ad6d88ba0..2255edaed3 100644
--- a/engines/gnap/scenes/group0.cpp
+++ b/engines/gnap/scenes/group0.cpp
@@ -68,7 +68,7 @@ void Scene01::updateHotspots() {
 void Scene01::run() {
 	// NOTE Removed _s01_dword_474380 which was set when the mud was taken
 	// which is also set in the global game flags.
-	
+
 	_vm->playSound(0x1091C, true);
 	_vm->startSoundTimerC(5);
 
@@ -109,7 +109,7 @@ void Scene01::run() {
 		_vm->updateGrabCursorSprite(0, 0);
 
 		switch (_vm->_sceneClickedHotspot) {
-		
+
 		case kHS01Device:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->runMenu();
@@ -277,12 +277,12 @@ void Scene01::run() {
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
 
-void Scene01::updateAnimations() {	
+void Scene01::updateAnimations() {
 	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
 		_vm->_gameSys->setAnimation(0, 0, 0);
 		switch (_vm->_gnapActionStatus) {
@@ -399,9 +399,9 @@ void Scene02::run() {
 	_nextChickenSequenceId = -1;
 	_vm->_timers[5] = _vm->getRandom(20) + 30;
 	_vm->_timers[4] = _vm->getRandom(100) + 300;
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	switch (_vm->_prevSceneNum) {
 	case 3:
 		_vm->initGnapPos(11, 6, kDirBottomLeft);
@@ -445,16 +445,16 @@ void Scene02::run() {
 		_vm->gnapWalkTo(2, 8, -1, 0x107B9, 1);
 		break;
 	}
-	
+
 	while (!_vm->_sceneDone) {
-		_vm->updateMouseCursor();	
+		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 6, 7, 6, 8, 6);
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS02Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -657,12 +657,12 @@ void Scene02::run() {
 			}
 			break;
 		}
-	
+
 		updateAnimations();
-	
+
 		if (!_vm->isSoundPlaying(0x1091C))
 			_vm->playSound(0x1091C, true);
-	
+
 		if (!_vm->_isLeavingScene) {
 			if (_vm->_platypusActionStatus < 0 && _vm->isFlag(kGFPlatypus))
 				_vm->updatePlatypusIdleSequence();
@@ -687,15 +687,15 @@ void Scene02::run() {
 			}
 			_vm->playSoundC();
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -807,7 +807,7 @@ void Scene02::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(2) == 2) {
 		if (_nextChickenSequenceId == 0x150) {
 			_vm->_gameSys->setAnimation(_nextChickenSequenceId, 179, 0);
@@ -874,24 +874,24 @@ void Scene03::updateHotspots() {
 void Scene03::run() {
 	_vm->playSound(0x10925, true);
 	_vm->startSoundTimerC(7);
-	
+
 	_vm->_gameSys->insertSequence(0x1CA, 251, 0, 0, kSeqLoop, 0, 0, 0);
 	_vm->_gameSys->insertSequence(0x1CB, 251, 0, 0, kSeqLoop, 0, 0, 0);
-	
+
 	_platypusHypnotized = false;
-	
+
 	_vm->initGnapPos(3, 4, kDirBottomRight);
-	
+
 	_vm->_gameSys->insertSequence(0x1C6, 253, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_currFrogSequenceId = 0x1C6;
 	_nextFrogSequenceId = -1;
 	_vm->_gameSys->setAnimation(0x1C6, 253, 2);
-	
+
 	_vm->_timers[6] = _vm->getRandom(20) + 30;
 	_vm->_timers[4] = _vm->getRandom(100) + 300;
 	_vm->_timers[5] = _vm->getRandom(100) + 200;
-	
+
 	if (_vm->isFlag(kGFPlatypus)) {
 		_vm->initPlatypusPos(5, 4, kDirNone);
 	} else {
@@ -901,27 +901,27 @@ void Scene03::run() {
 		_vm->_platypusSequenceId = 0x1C2;
 		_vm->_platypusSequenceDatNum = 0;
 	}
-	
+
 	_vm->_gameSys->insertSequence(0x1C4, 255, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	if (!_vm->isFlag(kGFGrassTaken))
 		_vm->_gameSys->insertSequence(0x1B2, 253, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	_vm->endSceneInit();
-	
+
 	if (_vm->isFlag(kGFPlatypus))
 		_vm->platypusWalkTo(4, 7, -1, 0x107C2, 1);
 	_vm->gnapWalkTo(3, 6, -1, 0x107B9, 1);
-	
+
 	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
 
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS03Platypus:
 			if (_vm->_gnapActionStatus < 0 && _vm->isFlag(kGFPlatypus)) {
@@ -1091,21 +1091,21 @@ void Scene03::run() {
 				}
 			}
 			break;
-			
+
 		default:
 			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 				_vm->_mouseClickState._left = false;
 			}
 			break;
-			
+
 		}
 
 		updateAnimations();
-	
+
 		if (!_vm->isSoundPlaying(0x10925))
 			_vm->playSound(0x10925, true);
-	
+
 		if (!_vm->_isLeavingScene) {
 			if (_vm->_platypusActionStatus < 0 && _vm->isFlag(kGFPlatypus))
 				_vm->updatePlatypusIdleSequence();
@@ -1140,9 +1140,9 @@ void Scene03::run() {
 			}
 			_vm->playSoundC();
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
@@ -1151,7 +1151,7 @@ void Scene03::run() {
 			_vm->_timers[4] = _vm->getRandom(100) + 300;
 			_vm->_timers[6] = _vm->getRandom(20) + 30;
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -1237,7 +1237,7 @@ void Scene03::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
 		if (_nextPlatSequenceId == 0x1BD || _nextPlatSequenceId == 0x1C0) {
 			_vm->_gameSys->setAnimation(0, 0, 1);
@@ -1280,14 +1280,14 @@ void Scene03::updateAnimations() {
 			_nextPlatSequenceId = -1;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(2) == 2 && _nextFrogSequenceId != -1) {
 		_vm->_gameSys->setAnimation(_nextFrogSequenceId, 253, 2);
 		_vm->_gameSys->insertSequence(_nextFrogSequenceId, 253, _currFrogSequenceId, 253, kSeqSyncWait, 0, 0, 0);
 		_currFrogSequenceId = _nextFrogSequenceId;
 		_nextFrogSequenceId = -1;
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(5) == 2) {
 		_vm->_gameSys->setAnimation(0, 0, 5);
 		_vm->invAdd(kItemGrass);
@@ -1342,7 +1342,7 @@ void Scene04::run() {
 
 	_currDogSequenceId = 0x210;
 	_nextDogSequenceId = -1;
-	
+
 	_vm->_gameSys->setAnimation(0x210, 139 - _dogIdCtr, 3);
 	_dogIdCtr = (_dogIdCtr + 1) % 2;
 	_vm->_timers[6] = _vm->getRandom(20) + 60;
@@ -1352,12 +1352,12 @@ void Scene04::run() {
 
 	if (!_vm->isFlag(kGFPlatypusTalkingToAssistant) && _vm->_cursorValue == 4)
 		_vm->_gameSys->insertSequence(0x212, 100, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	if (!_vm->isFlag(kGFTwigTaken))
 		_vm->_gameSys->insertSequence(0x1FE, 100, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	if (_vm->isFlag(kGFPlatyPussDisguised)) {
 		_vm->_timers[3] = 300;
 		// TODO setCursor((LPCSTR)IDC_WAIT);
@@ -1407,16 +1407,16 @@ void Scene04::run() {
 		_vm->gnapWalkTo(9, 9, -1, 0x107BA, 1);
 		}
 	}
-	
+
 	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-		
+
 		_vm->testWalk(0, 4, -1, -1, -1, -1);
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS04Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -1456,7 +1456,7 @@ void Scene04::run() {
 				}
 			}
 			break;
-		
+
 		case kHS04Twig:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -1480,7 +1480,7 @@ void Scene04::run() {
 				}
 			}
 			break;
-		
+
 		case kHS04Axe:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -1505,7 +1505,7 @@ void Scene04::run() {
 				}
 			}
 			break;
-		
+
 		case kHS04Dog:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -1537,7 +1537,7 @@ void Scene04::run() {
 				}
 			}
 			break;
-		
+
 		case kHS04Door:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -1568,7 +1568,7 @@ void Scene04::run() {
 				}
 			}
 			break;
-		
+
 		case kHS04ExitTruck:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_isLeavingScene = true;
@@ -1582,7 +1582,7 @@ void Scene04::run() {
 					_vm->_newSceneNum = 33;
 			}
 			break;
-		
+
 		case kHS04Window:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -1612,7 +1612,7 @@ void Scene04::run() {
 				}
 			}
 			break;
-		
+
 		case kHS04ExitBarn:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_isLeavingScene = true;
@@ -1626,27 +1626,27 @@ void Scene04::run() {
 					_vm->_newSceneNum = 35;
 			}
 			break;
-		
+
 		case kHS04WalkArea1:
 		case kHS04WalkArea2:
 			if (_vm->_gnapActionStatus < 0)
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
-			
+
 		default:
 			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 				_vm->_mouseClickState._left = false;
 			}
 			break;
-			      	
+
 		}
-	
+
 		updateAnimations();
-	
+
 		if (!_vm->isSoundPlaying(0x1091C))
 			_vm->playSound(0x1091C, true);
-	
+
 		if (!_vm->_isLeavingScene) {
 			if (_vm->_platypusActionStatus < 0 && _vm->isFlag(kGFPlatypus))
 				_vm->platypusSub426234();
@@ -1672,15 +1672,15 @@ void Scene04::run() {
 			}
 			_vm->playSoundC();
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -1778,7 +1778,7 @@ void Scene04::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(2) == 2) {
 		_vm->_gameSys->setAnimation(0, 0, 2);
 		_vm->invAdd(kItemTwig);
@@ -1786,7 +1786,7 @@ void Scene04::updateAnimations() {
 		_vm->setFlag(kGFTwigTaken);
 		updateHotspots();
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
 		if (_nextDogSequenceId == 0x201) {
 			_vm->_gameSys->insertSequence(_nextDogSequenceId, 139 - _dogIdCtr,
@@ -1848,11 +1848,11 @@ void Scene05::updateHotspots() {
 void Scene05::run() {
 	_vm->playSound(0x1091C, true);
 	_vm->startSoundTimerC(7);
-	
+
 	_currChickenSequenceId = 0x142;
 	_vm->_gameSys->setAnimation(0x142, 100, 3);
 	_vm->_gameSys->insertSequence(0x142, 100, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_nextChickenSequenceId = -1;
 
 	_vm->_timers[5] = _vm->getRandom(10) + 30;
@@ -1860,9 +1860,9 @@ void Scene05::run() {
 
 	if (_vm->isFlag(kGFBarnPadlockOpen))
 		_vm->_gameSys->insertSequence(0x14A, 141, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	if (_vm->_prevSceneNum != 6 && _vm->_prevSceneNum != 36) {
 		_vm->initGnapPos(-1, 8, kDirBottomRight);
 		if (_vm->isFlag(kGFPlatypus))
@@ -1877,16 +1877,16 @@ void Scene05::run() {
 			_vm->initPlatypusPos(7, 9, kDirNone);
 		_vm->endSceneInit();
 	}
-	
+
 	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 12, -1, -1, -1, -1);
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS05Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -2066,7 +2066,7 @@ void Scene05::run() {
 			if (_vm->_gnapActionStatus < 0)
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
-			
+
 		case kHS05WalkArea3:
 			// Nothing
 			break;
@@ -2077,14 +2077,14 @@ void Scene05::run() {
 				_vm->_mouseClickState._left = false;
 			}
 			break;
-		
+
 		}
-	
+
 		updateAnimations();
-	
+
 		if (!_vm->isSoundPlaying(0x1091C))
 			_vm->playSound(0x1091C, true);
-	
+
 		if (!_vm->_isLeavingScene) {
 			if (_vm->isFlag(kGFPlatypus))
 				_vm->updatePlatypusIdleSequence();
@@ -2105,16 +2105,16 @@ void Scene05::run() {
 			}
 			_vm->playSoundC();
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 			_vm->_timers[5] = _vm->getRandom(20) + 30;
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -2178,7 +2178,7 @@ void Scene05::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
 		if (_vm->_platypusSequenceId == 0x146) {
 			_vm->_platX = 4;
@@ -2206,7 +2206,7 @@ void Scene05::updateAnimations() {
 			_vm->_timers[1] = 300;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
 		if (_nextChickenSequenceId == 0x14B) {
 			_vm->_gameSys->setAnimation(_nextChickenSequenceId, 100, 3);
@@ -2258,7 +2258,7 @@ void Scene06::updateHotspots() {
 	_vm->setHotspot(kHS06WalkArea4, 475, 469, 800, 505);
 	_vm->setHotspot(kHS06WalkArea5, 0, 0, 800, 504);
 	_vm->setDeviceHotspot(kHS06Device, -1, -1, -1, -1);
-    if (_vm->isFlag(kGFGasTaken)) 
+    if (_vm->isFlag(kGFGasTaken))
     	_vm->_hotspots[kHS06Ladder]._flags = SF_DISABLED;
 	if (_vm->_cursorValue == 4) {
 		_vm->_hotspots[kHS06Ladder]._flags = SF_DISABLED;
@@ -2269,7 +2269,7 @@ void Scene06::updateHotspots() {
 
 void Scene06::run() {
 	bool triedDeviceOnGas = false;
-	
+
 	_vm->startSoundTimerC(7);
 
 	_horseTurnedBack = false;
@@ -2285,28 +2285,28 @@ void Scene06::run() {
 		_vm->_gameSys->insertSequence(0xF7, 20, 0, 0, kSeqNone, 0, 0, 0);
 	else
 		_vm->_gameSys->insertSequence(0xF8, 20, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	if (!_vm->isFlag(kGFGasTaken) && _vm->_cursorValue != 4)
 		_vm->_gameSys->insertSequence(0xFE, 20, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	_vm->initGnapPos(5, 12, kDirBottomRight);
 	_vm->initPlatypusPos(6, 12, kDirNone);
 	_vm->endSceneInit();
-	
+
 	_vm->platypusWalkTo(6, 8, -1, 0x107C2, 1);
 	_vm->gnapWalkTo(5, 8, -1, 0x107B9, 1);
-	
+
 	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-		
+
 		_vm->testWalk(0, 5, -1, -1, -1, -1);
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS06Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -2314,7 +2314,7 @@ void Scene06::run() {
 				updateHotspots();
 			}
 			break;
-		
+
 		case kHS06Platypus:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
@@ -2474,7 +2474,7 @@ void Scene06::run() {
 		}
 
 		updateAnimations();
-	
+
 		if (!_vm->_isLeavingScene) {
 			if (_vm->_platypusActionStatus < 0)
 				_vm->updatePlatypusIdleSequence();
@@ -2504,15 +2504,15 @@ void Scene06::run() {
 			}
 			_vm->playSoundC();
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -2555,7 +2555,7 @@ void Scene06::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
 		_vm->_gameSys->setAnimation(0, 0, 1);
 		if (_vm->_platypusSequenceId == 0xFA) {
@@ -2580,7 +2580,7 @@ void Scene06::updateAnimations() {
 			_vm->_platypusActionStatus = 6;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(2) == 2 && _nextHorseSequenceId != -1) {
 		switch (_nextHorseSequenceId) {
 		case 0xF2:
@@ -2650,7 +2650,7 @@ void Scene07::run() {
 
 	_vm->invRemove(kItemGas);
 	_vm->invRemove(kItemNeedle);
-	
+
 	if (!_vm->isFlag(kGFPlatypus))
 		_vm->_gameSys->insertSequence(0x8D, 1, 0, 0, kSeqNone, 0, 0, 0);
 
@@ -2761,7 +2761,7 @@ void Scene07::run() {
 		case kHS07WalkArea2:
 			_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
-			
+
 		case kHS07WalkArea3:
 			// Nothing
 			break;
@@ -2897,52 +2897,52 @@ void Scene08::run() {
 
 	_vm->_gameSys->insertSequence(0x14F, 1, 0, 0, kSeqLoop, 0, 0, 0);
 	_vm->_gameSys->insertSequence(0x14E, 256, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_currDogSequenceId = 0x135;
 	_nextDogSequenceId = 0x135;
-	
+
 	_vm->_gameSys->setAnimation(0x135, 100, 3);
 	_vm->_gameSys->insertSequence(_currDogSequenceId, 100, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_currManSequenceId = 0x140;
 	_nextManSequenceId = -1;
-	
+
 	_vm->_gameSys->setAnimation(0x140, 100, 2);
 	_vm->_gameSys->insertSequence(_currManSequenceId, 100, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_vm->_timers[4] = _vm->getRandom(50) + 75;
-	
+
 	if (!_vm->isFlag(kGFBarnPadlockOpen))
 		_vm->_gameSys->insertSequence(0x144, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	if (!_vm->isFlag(kGFTruckFilledWithGas))
 		_vm->_gameSys->insertSequence(0x145, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	if (!_vm->isFlag(kGFTruckKeysUsed))
 		_vm->_gameSys->insertSequence(0x146, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_vm->initGnapPos(-1, 8, kDirBottomRight);
 	_vm->initPlatypusPos(-1, 7, kDirNone);
-	
+
 	_vm->endSceneInit();
-	
+
 	_vm->gnapWalkTo(1, 8, -1, 0x107B9, 1);
 	_vm->platypusWalkTo(1, 7, -1, 0x107C2, 1);
-	
+
 	_vm->_timers[5] = _vm->getRandom(40) + 50;
-	
-	while (!_vm->_sceneDone) {	
+
+	while (!_vm->_sceneDone) {
 		if (!_vm->isSoundPlaying(0x10919))
 			_vm->playSound(0x10919, true);
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
-		
+
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
 
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS08Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -3156,7 +3156,7 @@ void Scene08::run() {
 			}
 			break;
 		}
-	
+
 		updateAnimations();
 
 		if (!_vm->_isLeavingScene) {
@@ -3185,9 +3185,9 @@ void Scene08::run() {
 			}
 			playRandomSound(5);
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
@@ -3195,7 +3195,7 @@ void Scene08::run() {
 			_vm->_timers[4] = _vm->getRandom(50) + 75;
 			_vm->_timers[5] = _vm->getRandom(40) + 50;
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -3236,7 +3236,7 @@ void Scene08::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
 		_vm->_gameSys->setAnimation(0, 0, 1);
 		switch (_vm->_platypusActionStatus) {
@@ -3249,14 +3249,14 @@ void Scene08::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(2) == 2 && _nextManSequenceId != -1) {
 		_vm->_gameSys->setAnimation(_nextManSequenceId, 100, 2);
 		_vm->_gameSys->insertSequence(_nextManSequenceId, 100, _currManSequenceId, 100, kSeqSyncWait, 0, 0, 0);
 		_currManSequenceId = _nextManSequenceId;
 		_nextManSequenceId = -1;
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
 		if (_currDogSequenceId == 0x147)
 			_vm->_platypusActionStatus = -1;
@@ -3343,12 +3343,12 @@ void Scene09::updateHotspots() {
 	_vm->_hotspotsCount = 8;
 }
 
-void Scene09::run() {	
+void Scene09::run() {
 	_vm->queueInsertDeviceIcon();
-	
+
 	_vm->_gameSys->insertSequence(0x4D, 1, 0, 0, kSeqLoop, 0, 0, 0);
 	_vm->_gameSys->insertSequence(0x4B, 2, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	if (_vm->_prevSceneNum == 8) {
 		_vm->initGnapPos(11, 8, kDirBottomLeft);
 		_vm->initPlatypusPos(12, 7, kDirUnk4);
@@ -3367,15 +3367,15 @@ void Scene09::run() {
 	while (!_vm->_sceneDone) {
 		if (!_vm->isSoundPlaying(0x10919))
 			_vm->playSound(0x10919, true);
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
-	
+
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS09Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -3454,9 +3454,9 @@ void Scene09::run() {
 			}
 			break;
 		}
-	
+
 		updateAnimations();
-	
+
 		if (!_vm->_isLeavingScene && _vm->_gnapActionStatus != 1 && _vm->_gnapActionStatus != 2) {
 			_vm->updatePlatypusIdleSequence();
 			_vm->updateGnapIdleSequence();
@@ -3469,9 +3469,9 @@ void Scene09::run() {
 			}
 			playRandomSound(5);
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
@@ -3479,7 +3479,7 @@ void Scene09::run() {
 			_vm->_timers[4] = _vm->getRandom(150) + 50;
 			_vm->_timers[5] = _vm->getRandom(40) + 50;
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
diff --git a/engines/gnap/scenes/group0.h b/engines/gnap/scenes/group0.h
index b288512471..38ded681af 100644
--- a/engines/gnap/scenes/group0.h
+++ b/engines/gnap/scenes/group0.h
@@ -295,7 +295,7 @@ public:
 	virtual void updateAnimationsCb() {}
 
 private:
-	bool _platypusHypnotized;	
+	bool _platypusHypnotized;
 	bool _platypusScared;
 	int _nextPlatSequenceId;
 	int _nextFrogSequenceId;
diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp
index d746eb54ff..90767500ed 100644
--- a/engines/gnap/scenes/group1.cpp
+++ b/engines/gnap/scenes/group1.cpp
@@ -57,16 +57,16 @@ void Scene10::updateHotspots() {
 
 void Scene10::run() {
 	_currCookSequenceId = 0x103;
-	
+
 	_vm->_gameSys->setAnimation(0x103, 100, 2);
 	_vm->_gameSys->insertSequence(0x103, 100, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_nextCookSequenceId = 0x106;
 	if (!_vm->isFlag(kGFMudTaken))
 		_vm->_gameSys->insertSequence(0x107, 100, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	if (_vm->_prevSceneNum == 9) {
 		_vm->initGnapPos(11, 8, kDirBottomLeft);
 		_vm->initPlatypusPos(12, 7, kDirUnk4);
@@ -87,19 +87,19 @@ void Scene10::run() {
 	while (!_vm->_sceneDone) {
 		if (!_vm->isSoundPlaying(0x1091E))
 			_vm->playSound(0x1091E, true);
-	
+
 		if (!_vm->isSoundPlaying(0x1091A))
 			_vm->playSound(0x1091A, true);
-	
+
 		_vm->updateMouseCursor();
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
-	
+
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS10Platypus:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -289,7 +289,7 @@ void Scene10::run() {
 				updateHotspots();
 			}
 			break;
-			
+
 		default:
 			if (_vm->_mouseClickState._left) {
 				_vm->gnapActionIdle(0x10C);
@@ -298,9 +298,9 @@ void Scene10::run() {
 			}
 			break;
 		}
-	
+
 		updateAnimations();
-	
+
 		if (!_vm->_isLeavingScene) {
 			_vm->updatePlatypusIdleSequence();
 			_vm->updateGnapIdleSequence();
@@ -324,15 +324,15 @@ void Scene10::run() {
 				}
 			}
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -349,7 +349,7 @@ void Scene10::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
 		_vm->_gameSys->setAnimation(0, 0, 1);
 		switch (_vm->_platypusActionStatus) {
@@ -358,9 +358,9 @@ void Scene10::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(2) == 2 && _nextCookSequenceId != -1) {
-		
+
 		switch (_nextCookSequenceId) {
 		case 0x109:
 			_vm->_platX = 4;
@@ -404,7 +404,7 @@ void Scene10::updateAnimations() {
 			_currCookSequenceId = _nextCookSequenceId;
 			break;
 		}
-	
+
 		switch (_currCookSequenceId) {
 		case 0x106: {
 			// TODO: Refactor into a if + a switch
@@ -516,13 +516,13 @@ void Scene11::updateHotspots() {
 
 void Scene11::run() {
 	bool flag = true;
-	
+
 	_vm->_timers[7] = 50;
 	_vm->_hotspots[kHS11Billard]._flags |= SF_DISABLED;
-	
+
 	_currGoggleGuySequenceId = 0x1F9;
 	_currHookGuySequenceId = 0x201;
-	
+
 	switch (_vm->_prevSceneNum) {
 	case 13:
 		_vm->initGnapPos(8, 5, kDirBottomLeft);
@@ -544,41 +544,41 @@ void Scene11::run() {
 		_vm->initPlatypusPos(6, 5, kDirUnk4);
 		break;
 	}
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	_vm->_gameSys->insertSequence(_currHookGuySequenceId, 120, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_nextHookGuySequenceId = -1;
-	
+
 	_vm->_gameSys->setAnimation(_currHookGuySequenceId, 120, 3);
 	_vm->_gameSys->insertSequence(_currGoggleGuySequenceId, 121, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_nextGoggleGuySequenceId = -1;
-	
+
 	_vm->_gameSys->setAnimation(_currGoggleGuySequenceId, 121, 2);
-	
+
 	_vm->_timers[5] = _vm->getRandom(100) + 75;
 	_vm->_timers[4] = _vm->getRandom(40) + 20;
 	_vm->_timers[6] = _vm->getRandom(100) + 100;
 	_vm->endSceneInit();
-	
+
 	if (_vm->_prevSceneNum == 12) {
 		_vm->gnapWalkTo(2, 8, -1, 0x107B9, 1);
 		_vm->platypusWalkTo(1, 8, -1, 0x107C2, 1);
 	}
 
 	_vm->_gameSys->insertSequence(0x208, 256, 0, 0, kSeqNone, 40, 0, 0);
-	
+
 	while (!_vm->_sceneDone) {
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
-	
+
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS11Platypus:
 			if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -718,18 +718,18 @@ void Scene11::run() {
 				updateHotspots();
 			}
 			break;
-			
+
 		default:
 			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 				_vm->_mouseClickState._left = false;
 			}
 			break;
-			
+
 		}
 
 		updateAnimations();
-	
+
 		if (!_vm->_isLeavingScene) {
 			if (flag && !_vm->_timers[7]) {
 				flag = false;
@@ -786,9 +786,9 @@ void Scene11::run() {
 				}
 			}
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
@@ -796,7 +796,7 @@ void Scene11::run() {
 			_vm->_timers[5] = _vm->getRandom(50) + 75;
 			_vm->_timers[4] = _vm->getRandom(40) + 20;
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -867,7 +867,7 @@ void Scene11::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(2) == 2 && _nextGoggleGuySequenceId != -1) {
 		_vm->_timers[5] = _vm->getRandom(100) + 75;
 		_vm->_gameSys->insertSequence(_nextGoggleGuySequenceId, 121, _currGoggleGuySequenceId, 121, kSeqSyncWait, 0, 0, 0);
@@ -877,7 +877,7 @@ void Scene11::updateAnimations() {
 		if (_vm->_gnapActionStatus >= 1 && _vm->_gnapActionStatus <= 4)
 			_vm->_gnapActionStatus = -1;
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
 		if (_nextHookGuySequenceId == 0x204) {
 			_vm->_gameSys->setAnimation(_nextHookGuySequenceId, 120, 3);
@@ -902,7 +902,7 @@ void Scene11::updateAnimations() {
 				_vm->_gnapActionStatus = -1;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(4) == 2) {
 		_vm->_gameSys->setAnimation(0, 0, 4);
 		_vm->_hotspots[kHS11Billard]._flags &= ~SF_DISABLED;
@@ -946,29 +946,29 @@ void Scene12::run() {
 
 	_vm->_gameSys->insertSequence(0x207, 256, 0, 0, kSeqNone, 0, 0, 0);
 	_vm->_gameSys->insertSequence(0x200, 50, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_currToothGuySequenceId = 0x200;
 	_nextToothGuySequenceId = -1;
-	
+
 	_vm->_gameSys->setAnimation(0x200, 50, 2);
 	_vm->_gameSys->insertSequence(0x202, 50, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_currBeardGuySequenceId = 0x202;
 	_nextBeardGuySequenceId = -1;
-	
+
 	_vm->_gameSys->setAnimation(0x202, 50, 4);
 	_vm->_gameSys->insertSequence(0x203, 50, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_currBarkeeperSequenceId = 0x203;
 	_nextBarkeeperSequenceId = -1;
-	
+
 	_vm->_gameSys->setAnimation(0x203, 50, 3);
-	
+
 	_vm->_timers[4] = 30;
 	_vm->_timers[6] = _vm->getRandom(30) + 20;
 	_vm->_timers[5] = _vm->getRandom(30) + 20;
 	_vm->_timers[7] = _vm->getRandom(100) + 100;
-	
+
 	if (_vm->_prevSceneNum == 15) {
 		_vm->initGnapPos(5, 6, kDirBottomRight);
 		_vm->initPlatypusPos(3, 7, kDirNone);
@@ -983,14 +983,14 @@ void Scene12::run() {
 
 	while (!_vm->_sceneDone) {
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
-	
+
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS12Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -1160,9 +1160,9 @@ void Scene12::run() {
 			break;
 
 		}
-	
+
 		updateAnimations();
-	
+
 		if (!_vm->_isLeavingScene) {
 			_vm->updatePlatypusIdleSequence();
 			_vm->updateGnapIdleSequence();
@@ -1218,9 +1218,9 @@ void Scene12::run() {
 				}
 			}
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
@@ -1229,7 +1229,7 @@ void Scene12::run() {
 			_vm->_timers[5] = _vm->getRandom(30) + 20;
 			_vm->_timers[6] = _vm->getRandom(30) + 20;
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -1326,7 +1326,7 @@ void Scene12::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
 		_vm->_gameSys->setAnimation(0, 0, 1);
 		switch (_vm->_platypusActionStatus) {
@@ -1338,7 +1338,7 @@ void Scene12::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(2) == 2) {
 		if (_currToothGuySequenceId == 0x1E9) {
 			_vm->_gameSys->setAnimation(0, 0, 2);
@@ -1381,7 +1381,7 @@ void Scene12::updateAnimations() {
 				_vm->_platypusActionStatus = -1;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
 		if (_vm->_gnapActionStatus == kAS12PlatWithBarkeeper && _currBarkeeperSequenceId == 0x1F9) {
 			_vm->_gnapActionStatus = -1;
@@ -1399,7 +1399,7 @@ void Scene12::updateAnimations() {
 				_vm->_gnapActionStatus = -1;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(4) == 2 && _nextBeardGuySequenceId != -1) {
 		_vm->_gameSys->insertSequence(_nextBeardGuySequenceId, 50, _currBeardGuySequenceId, 50, kSeqSyncWait, 0, 0, 0);
 		_vm->_gameSys->setAnimation(_nextBeardGuySequenceId, 50, 4);
@@ -1465,9 +1465,9 @@ void Scene13::run() {
 	int currSoundId = 0;
 
 	_vm->queueInsertDeviceIcon();
-	
+
 	_vm->_gameSys->insertSequence(0xAA, 256, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	if (_vm->_prevSceneNum == 14) {
 		_vm->initGnapPos(6, 6, kDirBottomLeft);
 		_vm->initPlatypusPos(9, 8, kDirNone);
@@ -1484,15 +1484,15 @@ void Scene13::run() {
 	while (!_vm->_sceneDone) {
 		if (!_vm->isSoundPlaying(0x1091A))
 			_vm->playSound(0x1091A, true);
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
-	
+
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS13Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -1663,7 +1663,7 @@ void Scene13::run() {
 		case kHS13WalkArea1:
 			// Nothing
 			break;
-			
+
 		default:
 			if (_vm->_mouseClickState._left) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
@@ -1671,9 +1671,9 @@ void Scene13::run() {
 			}
 			break;
 		}
-	
+
 		updateAnimations();
-	
+
 		if (!_vm->_isLeavingScene) {
 			_vm->updatePlatypusIdleSequence();
 			if (_vm->_platY == 5 || _vm->_platY == 6)
@@ -1726,9 +1726,9 @@ void Scene13::run() {
 				}
 			}
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
@@ -1736,7 +1736,7 @@ void Scene13::run() {
 			_vm->_timers[4] = _vm->getRandom(20) + 20;
 			_vm->_timers[5] = _vm->getRandom(50) + 50;
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -1798,7 +1798,7 @@ void Scene13::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
 		_vm->_gameSys->setAnimation(0, 0, 1);
 		_vm->_platypusActionStatus = -1;
@@ -1831,12 +1831,12 @@ void Scene14::run() {
 	_vm->_largeSprite = nullptr;
 
 	_vm->queueInsertDeviceIcon();
-	
+
 	if (!_vm->isFlag(kGFNeedleTaken))
 		_vm->_gameSys->insertSequence(0x23, 10, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_vm->endSceneInit();
-	
+
 	if (!_vm->isFlag(kGFNeedleTaken) && _vm->invHas(kItemTongs))
 		_vm->_largeSprite = _vm->_gameSys->createSurface(1);
 
@@ -1845,14 +1845,14 @@ void Scene14::run() {
 		_vm->_gnapSequenceId = 0x24;
 		_vm->_timers[2] = _vm->getRandom(40) + 50;
 	}
-	
-	while (!_vm->_sceneDone) {	
+
+	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS14Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -1919,37 +1919,37 @@ void Scene14::run() {
 			_vm->_mouseClickState._left = false;
 			break;
 		}
-	
+
 		updateAnimations();
 		_vm->checkGameKeys();
-	
+
 		if (!_vm->isFlag(kGFNeedleTaken) && !_vm->_timers[2]) {
 			_vm->_gameSys->insertSequence(0x24, 10, _vm->_gnapSequenceId, 10, kSeqSyncWait, 0, 0, 0);
 			_vm->_gnapSequenceId = 0x24;
 			_vm->_timers[2] = _vm->getRandom(40) + 50;
 		}
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
-	
+
 	if (_vm->_largeSprite)
 		_vm->deleteSurface(&_vm->_largeSprite);
 }
 
-void Scene14::updateAnimations() {	
+void Scene14::updateAnimations() {
 	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
 		_vm->_gameSys->setAnimation(0, 0, 0);
 		_vm->_gameSys->insertSpriteDrawItem(_vm->_largeSprite, 0, 0, 300);
 		_vm->_gameSys->setAnimation(0x10843, 301, 1);
 		_vm->_gameSys->insertSequence(0x10843, 301, 0x26, 10, kSeqSyncWait, 0, 0, 0);
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
 		_vm->_gameSys->setAnimation(0, 0, 1);
 		_vm->_sceneDone = true;
@@ -2008,23 +2008,23 @@ void Scene15::run() {
 
 	_vm->_gameSys->setAnimation(0xD5, 1, 0);
 	_vm->_gameSys->insertSequence(_currRecordSequenceId, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	_vm->endSceneInit();
-	
+
 	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->_hotspots[kHS15Platypus]._x1 = 0;
 		_vm->_hotspots[kHS15Platypus]._y1 = 0;
 		_vm->_hotspots[kHS15Platypus]._x2 = 0;
 		_vm->_hotspots[kHS15Platypus]._y2 = 0;
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-		
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS15Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -2145,21 +2145,21 @@ void Scene15::run() {
 			break;
 
 		}
-	
+
 		updateAnimations();
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
 
-void Scene15::updateAnimations() {	
+void Scene15::updateAnimations() {
 	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
 		if (_vm->_isLeavingScene) {
 			_vm->_sceneDone = true;
@@ -2491,7 +2491,7 @@ void Scene17::run() {
 
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS17Device:
 			if (_vm->_gnapActionStatus < 0 || _vm->_gnapActionStatus == 3) {
@@ -2565,7 +2565,7 @@ void Scene17::run() {
 				}
 			}
 			break;
-	
+
 		case kHS17Phone1:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex == kItemDiceQuarterHole) {
@@ -2650,7 +2650,7 @@ void Scene17::run() {
 				}
 			}
 			break;
-	
+
 		case kHS17ExitToyStore:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_isLeavingScene = true;
@@ -2662,7 +2662,7 @@ void Scene17::run() {
 					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[5].x - 1, _vm->_hotspotsWalkPos[5].y, -1, 0x107C2, 1);
 			}
 			break;
-	
+
 		case kHS17ExitGrubCity:
 			if (_vm->_gnapActionStatus < 0) {
 				platHangUpPhone();
@@ -2674,14 +2674,14 @@ void Scene17::run() {
 				_vm->platypusWalkTo(_vm->_hotspotsWalkPos[3].x + 1, _vm->_hotspotsWalkPos[3].y, -1, 0x107C2, 1);
 			}
 			break;
-	
+
 		case kHS17WalkArea1:
 		case kHS17WalkArea2:
 		case kHS17WalkArea3:
 			if (_vm->_gnapActionStatus < 0)
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
-	
+
 		default:
 			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
@@ -2689,12 +2689,12 @@ void Scene17::run() {
 			}
 			break;
 		}
-	
+
 		updateAnimations();
-		
+
 		if (!_vm->isSoundPlaying(0x10940))
 			_vm->playSound(0x10940, true);
-	
+
 		if (!_vm->_isLeavingScene) {
 			if (_vm->_platypusActionStatus < 0)
 				_vm->platypusSub426234();
@@ -2777,15 +2777,15 @@ void Scene17::run() {
 			}
 			_vm->playSoundA();
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -3126,11 +3126,11 @@ void Scene18::updateHotspots() {
 void Scene18::gnapCarryGarbageCanTo(int x, int y, int animationIndex, int argC, int a5) {
 	// CHECKME: (x, y) is always set to (-1, -1)
 
-	// TODO Cleanup	
+	// TODO Cleanup
 	static const int kSequenceIds[] = {
 		0x203, 0x204
 	};
-	
+
 	int gnapSeqId, gnapId, gnapDatNum, gnapGridX;
 	int clippedX, v12, v5, v10, v11, direction;
 
@@ -3152,7 +3152,7 @@ void Scene18::gnapCarryGarbageCanTo(int x, int y, int animationIndex, int argC,
 	v12 = _vm->_gridMaxX - 1;
 	if (_vm->_gridMaxX - 1 >= v11)
 		v12 = v11;
-	
+
 	if (v12 == _vm->_gnapX) {
 		gnapSeqId = _vm->_gnapSequenceId;
 		gnapId = _vm->_gnapId;
@@ -3195,7 +3195,7 @@ void Scene18::gnapCarryGarbageCanTo(int x, int y, int animationIndex, int argC,
 			gnapGridX += direction;
 		} while (v12 != gnapGridX);
 	}
-	
+
 	if (argC >= 0) {
 		_vm->_gnapSequenceId = ridToEntryIndex(argC);
 		_vm->_gnapSequenceDatNum = ridToDatIndex(argC);
@@ -3206,17 +3206,17 @@ void Scene18::gnapCarryGarbageCanTo(int x, int y, int animationIndex, int argC,
 			_vm->_gnapSequenceId = 0x209;
 		_vm->_gnapSequenceDatNum = 0;
 	}
-	
+
 	if (direction == 1)
 		_vm->_gnapIdleFacing = kDirBottomRight;
 	else
 		_vm->_gnapIdleFacing = kDirBottomLeft;
-	
+
 	_vm->_gnapId = 20 * _vm->_gnapY + 1;
-	
+
 	if (animationIndex >= 0)
 		_vm->_gameSys->setAnimation(makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, animationIndex);
-	
+
 	_vm->_gameSys->insertSequence(makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId,
 		gnapSeqId | (gnapDatNum << 16), gnapId,
 		kSeqScale | kSeqSyncWait, 0, 75 * gnapGridX - _vm->_gnapGridX, 48 * _vm->_gnapY - _vm->_gnapGridY);
@@ -3311,13 +3311,13 @@ void Scene18::run() {
 
 	_vm->playSound(0x10940, true);
 	_vm->startSoundTimerA(4);
-	
+
 	_vm->_timers[5] = _vm->getRandom(100) + 100;
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	_vm->clearFlag(kGFPlatyPussDisguised);
-	
+
 	if (!_vm->isFlag(kGFUnk14))
 		_vm->_gameSys->insertSequence(0x1F8, 19, 0, 0, kSeqNone, 0, 0, 0);
 
@@ -3341,7 +3341,7 @@ void Scene18::run() {
 			_vm->playSound(0x22B, true);
 		}
 	}
-	
+
 	if (_vm->isFlag(kGFPlatypusTalkingToAssistant)) {
 		if (_vm->_prevSceneNum == 17)
 			_vm->initGnapPos(4, 11, kDirBottomRight);
@@ -3398,12 +3398,12 @@ void Scene18::run() {
 	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 20, -1, -1, -1, -1);
-		
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-		
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS18Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -3708,18 +3708,18 @@ void Scene18::run() {
 			}
 			break;
 		}
-	
+
 		updateAnimations();
-	
+
 		if (!_vm->isSoundPlaying(0x10940))
 			_vm->playSound(0x10940, true);
-	
+
 		if ((_vm->isFlag(kGFTruckFilledWithGas) || _vm->isFlag(kGFBarnPadlockOpen)) && !_vm->isSoundPlaying(0x22B) &&
 			_vm->_gnapActionStatus != kAS18OpenRightValveNoGarbageCanDone && _vm->_gnapActionStatus != kAS18OpenRightValveNoGarbageCan &&
 			_vm->_gnapActionStatus != kAS18OpenTopValve && _vm->_gnapActionStatus != kAS18OpenTopValveDone &&
 			_vm->_gnapActionStatus != kAS18OpenRightValveWithGarbageCan && _vm->_gnapActionStatus != kAS18OpenRightValveWithGarbageCanDone)
 			_vm->playSound(0x22B, true);
-	
+
 		if (!_vm->_isLeavingScene) {
 			if (!_vm->isFlag(kGFPlatypusTalkingToAssistant)) {
 				if (_vm->_platypusActionStatus == kAS18PlatComesHere) {
@@ -3751,15 +3751,15 @@ void Scene18::run() {
 			if (!_vm->isFlag(kGFPlatyPussDisguised))
 				_vm->updateGnapIdleSequence();
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 
@@ -3994,7 +3994,7 @@ void Scene18::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
 		_vm->_gameSys->setAnimation(0, 0, 3);
 		++_platPhoneIter;
@@ -4101,7 +4101,7 @@ void Scene19::run() {
 		_vm->gnapWalkTo(4, 9, -1, 0x107B9, 1);
 		_vm->platypusWalkTo(5, 9, -1, 0x107C2, 1);
 	}
-	
+
 	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
@@ -4274,7 +4274,7 @@ void Scene19::run() {
 		}
 
 		updateAnimations();
-	
+
 		if (!_vm->_isLeavingScene) {
 			_vm->updateGnapIdleSequence();
 			if (!_vm->isFlag(kGFPlatypusTalkingToAssistant)) {
@@ -4293,13 +4293,13 @@ void Scene19::run() {
 		}
 
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 
diff --git a/engines/gnap/scenes/group1.h b/engines/gnap/scenes/group1.h
index a1f86e249e..2a9fe8c738 100644
--- a/engines/gnap/scenes/group1.h
+++ b/engines/gnap/scenes/group1.h
@@ -373,7 +373,7 @@ private:
 	int _nextUpperButtonSequenceId;
 	int _currUpperButtonSequenceId;
 	int _nextLowerButtonSequenceId;
-	int _currLowerButtonSequenceId;	
+	int _currLowerButtonSequenceId;
 };
 
 class Scene17: public Scene {
diff --git a/engines/gnap/scenes/group2.cpp b/engines/gnap/scenes/group2.cpp
index 293d58ce05..98b6752afe 100644
--- a/engines/gnap/scenes/group2.cpp
+++ b/engines/gnap/scenes/group2.cpp
@@ -173,26 +173,26 @@ void Scene20::run() {
 		_currStonerGuySequenceId = 0x173;
 		break;
 	}
-	
+
 	_nextStonerGuySequenceId = -1;
 	_vm->_gameSys->setAnimation(_currStonerGuySequenceId, 21, 2);
 	_vm->_gameSys->insertSequence(_currStonerGuySequenceId, 21, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_vm->_timers[6] = _vm->getRandom(20) + 30;
-	
+
 	_currGroceryStoreGuySequenceId = 0x17C;
 	_nextGroceryStoreGuySequenceId = -1;
-	_vm->_gameSys->setAnimation(0x17C, 20, 3);	
+	_vm->_gameSys->setAnimation(0x17C, 20, 3);
 	_vm->_gameSys->insertSequence(0x17C, 20, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_vm->_timers[5] = _vm->getRandom(50) + 130;
 	if (_vm->isFlag(kGFGroceryStoreHatTaken))
 		_vm->_gameSys->insertSequence(0x17F, 20, 0, 0, kSeqNone, 0, 0, 0);
 	else
 		_vm->_gameSys->insertSequence(0x174, 20, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	if (_vm->isFlag(kGFSceneFlag1)) {
 		_vm->clearFlag(kGFSceneFlag1);
 		_vm->endSceneInit();
@@ -247,17 +247,17 @@ void Scene20::run() {
 			break;
 		}
 	}
-	
+
 	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
 		_vm->testWalk(0, 1, 7, 9, 8, 9);
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS20Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -304,7 +304,7 @@ void Scene20::run() {
 				_vm->_platypusFacing = kDirUnk4;
 			}
 			break;
-		
+
 		case kHS20ExitPhone:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_stonerGuyShowingJoint)
@@ -316,7 +316,7 @@ void Scene20::run() {
 				_vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS20ExitPhone].x + 1, _vm->_hotspotsWalkPos[kHS20ExitPhone].y, -1, 0x107C2, 1);
 			}
 			break;
-		
+
 		case kHS20ExitOutsideToyStore:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_stonerGuyShowingJoint)
@@ -330,7 +330,7 @@ void Scene20::run() {
 				_vm->_hotspots[kHS20WalkArea2]._flags &= ~SF_WALKABLE;
 			}
 			break;
-		
+
 		case kHS20ExitInsideGrubCity:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_stonerGuyShowingJoint)
@@ -343,7 +343,7 @@ void Scene20::run() {
 				_vm->_platypusFacing = kDirUnk4;
 			}
 			break;
-		
+
 		case kHS20ExitOutsideCircusWorld:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_stonerGuyShowingJoint)
@@ -355,7 +355,7 @@ void Scene20::run() {
 				_vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS20ExitOutsideCircusWorld].x + 1, _vm->_hotspotsWalkPos[kHS20ExitOutsideCircusWorld].y, -1, 0x107C2, 1);
 			}
 			break;
-		
+
 		case kHS20StonerGuy:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -388,7 +388,7 @@ void Scene20::run() {
 				}
 			}
 			break;
-		
+
 		case kHS20GroceryStoreGuy:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -416,7 +416,7 @@ void Scene20::run() {
 				}
 			}
 			break;
-		
+
 		case kHS20GroceryStoreHat:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex == kItemCowboyHat) {
@@ -444,26 +444,26 @@ void Scene20::run() {
 				}
 			}
 			break;
-		
+
 		case kHS20WalkArea1:
 		case kHS20WalkArea2:
 			_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
-		
+
 		default:
 			if (_vm->_mouseClickState._left) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 				_vm->_mouseClickState._left = false;
 			}
 			break;
-		
+
 		}
 
 		updateAnimations();
 
 		if (!_vm->isSoundPlaying(0x10940))
 			_vm->playSound(0x10940, true);
-	
+
 		if (!_vm->_isLeavingScene) {
 			if (_vm->_platypusActionStatus < 0) {
 				_vm->_hotspots[kHS20WalkArea1]._y2 += 48;
@@ -497,9 +497,9 @@ void Scene20::run() {
 			}
 			_vm->playSoundA();
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
@@ -628,7 +628,7 @@ void Scene20::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
 		switch (_nextGroceryStoreGuySequenceId) {
 		case 0x176:
@@ -730,11 +730,11 @@ void Scene21::updateHotspots() {
 void Scene21::run() {
 	_vm->playSound(0x10940, true);
 	_vm->startSoundTimerA(6);
-	
+
 	_vm->_timers[5] = _vm->getRandom(100) + 100;
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	if (_vm->isFlag(kGFTwigTaken)) {
 		if (_vm->isFlag(kGFKeysTaken)) {
 			_vm->initGnapPos(5, 8, kDirBottomRight);
@@ -765,14 +765,14 @@ void Scene21::run() {
 		_vm->gnapWalkTo(5, 8, -1, 0x107B9, 1);
 		_vm->platypusWalkTo(6, 8, -1, 0x107C2, 1);
 	}
-	
+
 	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
 
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS21Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -862,7 +862,7 @@ void Scene21::run() {
 				}
 			}
 			break;
-		
+
 		case kHS21ExitOutsideGrubCity:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_isLeavingScene = true;
@@ -872,26 +872,26 @@ void Scene21::run() {
 				_vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS21ExitOutsideGrubCity].x + 1, _vm->_hotspotsWalkPos[kHS21ExitOutsideGrubCity].y, -1, 0x107C2, 1);
 			}
 			break;
-		
+
 		case kHS21WalkArea1:
 		case kHS21WalkArea2:
 			_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
-		
+
 		default:
 			if (_vm->_mouseClickState._left) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 				_vm->_mouseClickState._left = false;
 			}
 			break;
-		
+
 		}
-	
+
 		updateAnimations();
-	
+
 		if (!_vm->isSoundPlaying(0x10940))
 			_vm->playSound(0x10940, true);
-	
+
 		if (!_vm->_isLeavingScene) {
 			_vm->updatePlatypusIdleSequence();
 			_vm->updateGnapIdleSequence();
@@ -915,15 +915,15 @@ void Scene21::run() {
 			}
 			_vm->playSoundA();
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -970,7 +970,7 @@ void Scene21::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(3) == 2 && _nextOldLadySequenceId != -1) {
 		if (_nextOldLadySequenceId == 0x87) {
 			_vm->_gameSys->setAnimation(_nextOldLadySequenceId, 79, 3);
@@ -1020,17 +1020,17 @@ void Scene22::updateHotspots() {
 
 void Scene22::run() {
 	_vm->_gameSys->insertSequence(0x5D, 254, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_currCashierSequenceId = 0x59;
 	_nextCashierSequenceId = -1;
-	
+
 	_vm->_gameSys->setAnimation(0x59, 1, 3);
 	_vm->_gameSys->insertSequence(_currCashierSequenceId, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_vm->_timers[6] = _vm->getRandom(30) + 20;
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	if (_vm->_prevSceneNum == 20) {
 		_vm->initGnapPos(2, 8, kDirBottomRight);
 		_vm->initPlatypusPos(1, 8, kDirNone);
@@ -1042,7 +1042,7 @@ void Scene22::run() {
 		_vm->gnapWalkTo(8, 8, -1, 0x107B9, 1);
 		_vm->platypusWalkTo(9, 8, -1, 0x107C2, 1);
 	}
-	
+
 	if (_vm->isFlag(kGFSceneFlag1)) {
 		int storeDetectiveSeqId;
 		_vm->setGrabCursorSprite(-1);
@@ -1075,16 +1075,16 @@ void Scene22::run() {
 		_vm->_newSceneNum = 20;
 		_caughtBefore = true;
 	}
-	
+
 	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS22Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -1138,7 +1138,7 @@ void Scene22::run() {
 				_vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS22ExitBackGrubCity].x, _vm->_hotspotsWalkPos[kHS22ExitBackGrubCity].y + 1, -1, 0x107C2, 1);
 			}
 			break;
-		
+
 		case kHS22Cashier:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -1164,12 +1164,12 @@ void Scene22::run() {
 				}
 			}
 			break;
-		
+
 		case kHS22WalkArea1:
 		case kHS22WalkArea2:
 			_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
-		
+
 		default:
 			if (_vm->_mouseClickState._left) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
@@ -1177,9 +1177,9 @@ void Scene22::run() {
 			}
 			break;
 		}
-	
+
 		updateAnimations();
-	
+
 		if (!_vm->_isLeavingScene) {
 			_vm->updatePlatypusIdleSequence();
 			_vm->updateGnapIdleSequence();
@@ -1206,9 +1206,9 @@ void Scene22::run() {
 				}
 			}
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
@@ -1218,7 +1218,7 @@ void Scene22::run() {
 			_vm->_timers[1] = _vm->getRandom(20) + 30;
 			_vm->_timers[0] = _vm->getRandom(75) + 75;
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -1236,7 +1236,7 @@ void Scene22::updateAnimations() {
 		}
 		_vm->_gnapActionStatus = -1;
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(3) == 2 && _nextCashierSequenceId != -1) {
 		_vm->_gameSys->setAnimation(_nextCashierSequenceId, 1, 3);
 		_vm->_gameSys->insertSequence(_nextCashierSequenceId, 1, _currCashierSequenceId, 1, kSeqSyncWait, 0, 0, 0);
@@ -1269,21 +1269,21 @@ void Scene23::updateHotspots() {
 void Scene23::run() {
 	_vm->_timers[4] = _vm->getRandom(100) + 200;
 	_vm->_timers[5] = _vm->getRandom(100) + 200;
-	
+
 	_currStoreClerkSequenceId = 0xB4;
 	_nextStoreClerkSequenceId = -1;
-	
+
 	_vm->_gameSys->setAnimation(0xB4, 1, 4);
 	_vm->_gameSys->insertSequence(_currStoreClerkSequenceId, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	_vm->initGnapPos(-1, 7, kDirBottomRight);
 	_vm->initPlatypusPos(-2, 7, kDirNone);
 	_vm->_gameSys->insertSequence(0xBD, 255, 0, 0, kSeqNone, 0, 0, 0);
 	_vm->_gameSys->insertSequence(0xBF, 2, 0, 0, kSeqNone, 0, 0, 0);
 	_vm->endSceneInit();
-	
+
 	_vm->platypusWalkTo(1, 7, -1, 0x107C2, 1);
 
 	if (_vm->isFlag(kGFUnk24)) {
@@ -1295,16 +1295,16 @@ void Scene23::run() {
 		_vm->playSequences(0x48, 0xBA, 0xBB, 0xBC);
 		_vm->setFlag(kGFUnk24);
 	}
-	
+
 	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 3, -1, -1, -1, -1);
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS23Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -1312,7 +1312,7 @@ void Scene23::run() {
 				updateHotspots();
 			}
 			break;
-		
+
 		case kHS23Platypus:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex == kItemJoint) {
@@ -1338,7 +1338,7 @@ void Scene23::run() {
 				}
 			}
 			break;
-		
+
 		case kHS23Cereals:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -1374,7 +1374,7 @@ void Scene23::run() {
 				}
 			}
 			break;
-		
+
 		case kHS23ExitFrontGrubCity:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_isLeavingScene = true;
@@ -1384,13 +1384,13 @@ void Scene23::run() {
 				_vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS23ExitFrontGrubCity].x, _vm->_hotspotsWalkPos[kHS23ExitFrontGrubCity].y - 1, -1, 0x107C2, 1);
 			}
 			break;
-		
+
 		case kHS23WalkArea1:
 		case kHS23WalkArea2:
 			if (_vm->_gnapActionStatus < 0)
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
-		
+
 		default:
 			if (_vm->_mouseClickState._left) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
@@ -1398,9 +1398,9 @@ void Scene23::run() {
 			}
 			break;
 		}
-	
+
 		updateAnimations();
-	
+
 		if (!_vm->_isLeavingScene) {
 			_vm->updatePlatypusIdleSequence();
 			_vm->updateGnapIdleSequence();
@@ -1434,15 +1434,15 @@ void Scene23::run() {
 				}
 			}
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -1472,7 +1472,7 @@ void Scene23::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(4) == 2 && _nextStoreClerkSequenceId == -1) {
 		switch (_vm->getRandom(8)) {
 		case 0:
@@ -1522,31 +1522,31 @@ void Scene24::updateHotspots() {
 
 void Scene24::run() {
 	int counter = 0;
-	
+
 	_vm->playSound(0x10940, true);
 	_vm->startSoundTimerA(9);
-	
+
 	_vm->_timers[7] = _vm->getRandom(100) + 100;
-	
+
 	_vm->_gameSys->insertSequence(0x2F, 256, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_vm->_timers[4] = _vm->getRandom(20) + 50;
 	_vm->_timers[5] = _vm->getRandom(20) + 40;
 	_vm->_timers[6] = _vm->getRandom(50) + 30;
-	
+
 	_vm->_gameSys->insertSequence(0x36, 20, 0, 0, kSeqNone, 0, 0, 0);
 	_vm->_gameSys->insertSequence(0x30, 20, 0, 0, kSeqNone, 0, 0, 0);
 	_vm->_gameSys->insertSequence(0x35, 20, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_currWomanSequenceId = 0x35;
 	_girlSequenceId = 0x36;
 	_boySequenceId = 0x30;
-	
+
 	if (_vm->_debugLevel == 4)
 		_vm->startIdleTimer(8);
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	if (_vm->_prevSceneNum == 20) {
 		_vm->initGnapPos(1, 8, kDirBottomRight);
 		_vm->initPlatypusPos(2, 8, kDirNone);
@@ -1560,16 +1560,16 @@ void Scene24::run() {
 		_vm->gnapWalkTo(2, 8, -1, 0x107BA, 1);
 		_vm->platypusWalkTo(3, 8, -1, 0x107C2, 1);
 	}
-	
+
 	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 
 		case kHS24Device:
@@ -1578,7 +1578,7 @@ void Scene24::run() {
 				updateHotspots();
 			}
 			break;
-		
+
 		case kHS24Platypus:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex == kItemJoint) {
@@ -1604,7 +1604,7 @@ void Scene24::run() {
 				}
 			}
 			break;
-		
+
 		case kHS24ExitCircusWorld:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_isLeavingScene = true;
@@ -1614,7 +1614,7 @@ void Scene24::run() {
 				_vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS24ExitCircusWorld].x + 1, _vm->_hotspotsWalkPos[kHS24ExitCircusWorld].y, -1, 0x107C2, 1);
 			}
 			break;
-		
+
 		case kHS24ExitOutsideGrubCity:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_isLeavingScene = true;
@@ -1625,14 +1625,14 @@ void Scene24::run() {
 				_vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS24ExitOutsideGrubCity].x + 1, _vm->_hotspotsWalkPos[kHS24ExitOutsideGrubCity].y, -1, 0x107C2, 1);
 			}
 			break;
-		
+
 		case kHS24WalkArea1:
 		case kHS24WalkArea2:
 		case kHS24WalkArea3:
 			if (_vm->_gnapActionStatus == -1)
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
-		
+
 		default:
 			if (_vm->_mouseClickState._left) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
@@ -1640,12 +1640,12 @@ void Scene24::run() {
 			}
 			break;
 		}
-	
+
 		updateAnimations();
-	
+
 		if (!_vm->isSoundPlaying(0x10940))
 			_vm->playSound(0x10940, true);
-	
+
 		if (!_vm->_isLeavingScene) {
 			_vm->updatePlatypusIdleSequence();
 			_vm->updateGnapIdleSequence();
@@ -1694,9 +1694,9 @@ void Scene24::run() {
 				_vm->updateIdleTimer();
 			_vm->playSoundA();
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
@@ -1780,16 +1780,16 @@ void Scene25::playAnims(int index) {
 void Scene25::run() {
 	_vm->playSound(0x10940, true);
 	_vm->startSoundTimerA(5);
-	
+
 	_currTicketVendorSequenceId = 0x52;
 	_vm->_gameSys->setAnimation(0x52, 39, 3);
 	_vm->_gameSys->insertSequence(_currTicketVendorSequenceId, 39, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_nextTicketVendorSequenceId = -1;
 	_vm->_timers[4] = _vm->getRandom(20) + 20;
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	if (_vm->_prevSceneNum == 24) {
 		_vm->initGnapPos(5, 11, kDirUpLeft);
 		_vm->initPlatypusPos(6, 11, kDirUnk4);
@@ -1803,14 +1803,14 @@ void Scene25::run() {
 		_vm->gnapWalkTo(5, 8, -1, 0x107B9, 1);
 		_vm->platypusWalkTo(6, 8, -1, 0x107C2, 1);
 	}
-	
+
 	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS25Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -1818,7 +1818,7 @@ void Scene25::run() {
 				updateHotspots();
 			}
 			break;
-		
+
 		case kHS25Platypus:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex == kItemJoint) {
@@ -1844,7 +1844,7 @@ void Scene25::run() {
 				}
 			}
 			break;
-		
+
 		case kHS25TicketVendor:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex == kItemTickets) {
@@ -1875,7 +1875,7 @@ void Scene25::run() {
 				}
 			}
 			break;
-		
+
 		case kHS25ExitOutsideCircusWorld:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_isLeavingScene = true;
@@ -1885,7 +1885,7 @@ void Scene25::run() {
 				_vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS25ExitOutsideCircusWorld].x + 1, _vm->_hotspotsWalkPos[kHS25ExitOutsideCircusWorld].y, -1, 0x107C2, 1);
 			}
 			break;
-		
+
 		case kHS25ExitInsideCircusWorld:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->isFlag(kGFNeedleTaken)) {
@@ -1904,7 +1904,7 @@ void Scene25::run() {
 				}
 			}
 			break;
-		
+
 		case kHS25Posters1:
 		case kHS25Posters2:
 		case kHS25Posters3:
@@ -1934,13 +1934,13 @@ void Scene25::run() {
 				}
 			}
 			break;
-		
+
 		case kHS25WalkArea1:
 		case kHS25WalkArea2:
 			if (_vm->_gnapActionStatus < 0)
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
-		
+
 		default:
 			if (_vm->_mouseClickState._left) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
@@ -1948,9 +1948,9 @@ void Scene25::run() {
 			}
 			break;
 		}
-	
+
 		updateAnimations();
-	
+
 		if (!_vm->_isLeavingScene) {
 			_vm->updatePlatypusIdleSequence();
 			_vm->updateGnapIdleSequence();
@@ -1991,15 +1991,15 @@ void Scene25::run() {
 			}
 			_vm->playSoundA();
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -2045,7 +2045,7 @@ void Scene25::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
 		if (_nextTicketVendorSequenceId == 0x53) {
 			_vm->_gameSys->insertSequence(_nextTicketVendorSequenceId, 39, _currTicketVendorSequenceId, 39, kSeqSyncWait, 0, 0, 0);
@@ -2104,7 +2104,7 @@ void Scene26::run() {
 	_vm->_gameSys->insertSequence(0x5C, 40, 0, 0, kSeqLoop, 0, 0, 0);
 	_vm->_gameSys->insertSequence(0x5D, 40, 0, 0, kSeqLoop, 0, 0, 0);
 	_vm->_gameSys->insertSequence(0x5E, 40, 0, 0, kSeqLoop, 0, 0, 0);
-	
+
 	if (_vm->_prevSceneNum == 25) {
 		_vm->initGnapPos(-1, 8, kDirBottomRight);
 		_vm->initPlatypusPos(-2, 8, kDirNone);
@@ -2208,7 +2208,7 @@ void Scene26::run() {
 			if (_vm->_gnapActionStatus < 0)
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
-			
+
 		default:
 			if (_vm->_mouseClickState._left) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
@@ -2244,13 +2244,13 @@ void Scene26::run() {
 		}
 
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -2310,10 +2310,10 @@ void Scene27::run() {
 		_vm->startIdleTimer(6);
 
 	_vm->_gameSys->insertSequence(0xCB, 39, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_currJanitorSequenceId = 0xCB;
 	_nextJanitorSequenceId = -1;
-	
+
 	_vm->_gameSys->setAnimation(0xCB, 39, 3);
 	_vm->_timers[5] = _vm->getRandom(20) + 60;
 
@@ -2489,16 +2489,16 @@ void Scene27::run() {
 			if (_vm->_gnapActionStatus < 0)
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
-			
+
 		default:
 			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 				_vm->_mouseClickState._left = false;
 			}
 			break;
-		
+
 		}
-	
+
 		updateAnimations();
 
 		if (!_vm->isSoundPlaying(0x1093B))
@@ -2869,7 +2869,7 @@ void Scene28::run() {
 			if (_vm->_gnapActionStatus < 0)
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
-			
+
 		default:
 			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
@@ -2900,7 +2900,7 @@ void Scene28::run() {
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -3083,7 +3083,7 @@ void Scene29::run() {
 		_vm->_gameSys->insertSequence(0xED, 39, 0, 0, kSeqNone, 0, 0, 0);
 		_vm->_gameSys->setAnimation(0, 0, 3);
 	}
-	
+
 	_vm->_gameSys->insertSequence(0xF3, 39, 0, 0, kSeqLoop, 0, 0, 0);
 	_vm->_gameSys->insertSequence(0xF5, 38, 0, 0, kSeqLoop, 0, 0, 0);
 
@@ -3104,10 +3104,10 @@ void Scene29::run() {
 	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-		
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS29Device:
 			if (_vm->_gnapActionStatus < 0) {
@@ -3220,7 +3220,7 @@ void Scene29::run() {
 			if (_vm->_gnapActionStatus < 0)
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
-		
+
 		default:
 			if (_vm->_mouseClickState._left) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
@@ -3228,7 +3228,7 @@ void Scene29::run() {
 			}
 			break;
 		}
-	
+
 		updateAnimations();
 
 		if (!_vm->isSoundPlaying(0x1093B))
@@ -3265,7 +3265,7 @@ void Scene29::run() {
 			}
 			_vm->playSoundB();
 		}
-	
+
 		_vm->checkGameKeys();
 
 		if (_vm->isKeyStatus1(8)) {
@@ -3273,7 +3273,7 @@ void Scene29::run() {
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
diff --git a/engines/gnap/scenes/group3.cpp b/engines/gnap/scenes/group3.cpp
index a9b86b7344..6d31df8b8a 100644
--- a/engines/gnap/scenes/group3.cpp
+++ b/engines/gnap/scenes/group3.cpp
@@ -196,20 +196,20 @@ void Scene30::run() {
 			}
 			_vm->playSoundB();
 		}
-	
+
 		_vm->checkGameKeys();
-		
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
 
-void Scene30::updateAnimations() {	
+void Scene30::updateAnimations() {
 	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
 		_vm->_gameSys->setAnimation(0, 0, 0);
 		switch (_vm->_gnapActionStatus) {
@@ -474,12 +474,12 @@ void Scene31::run() {
 			}
 			break;
 		}
-	
+
 		updateAnimations();
-	
+
 		if (!_vm->isSoundPlaying(0x1093B))
 			_vm->playSound(0x1093B, true);
-	
+
 		if (!_vm->_isLeavingScene) {
 			if (_vm->_platypusActionStatus < 0)
 				_vm->updatePlatypusIdleSequence();
@@ -523,7 +523,7 @@ void Scene31::run() {
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -1391,7 +1391,7 @@ void Scene39::updateHotspots() {
 void Scene39::run() {
 	// Bug in the original? Timer was never initialized.
 	_vm->_timers[5] = 0;
-	
+
 	_vm->queueInsertDeviceIcon();
 	_currGuySequenceId = 0x33;
 
@@ -1409,16 +1409,16 @@ void Scene39::run() {
 		_vm->initPlatypusPos(5, 7, kDirNone);
 		_vm->endSceneInit();
 	}
-	
+
 	while (!_vm->_sceneDone) {
 		if (!_vm->isSoundPlaying(0x1094B)) {
 			_vm->playSound(0x1094B, true);
 			_vm->setSoundVolume(0x1094B, 60);
 		}
-		
+
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
 
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
@@ -1430,7 +1430,7 @@ void Scene39::run() {
 			updateHotspots();
 			_vm->_timers[5] = _vm->getRandom(20) + 50;
 			break;
-	
+
 		case kHS39Platypus:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -1454,7 +1454,7 @@ void Scene39::run() {
 				}
 			}
 			break;
-	
+
 		case kHS39ExitUfoParty:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_isLeavingScene = true;
@@ -1464,7 +1464,7 @@ void Scene39::run() {
 				_vm->_newSceneNum = 40;
 			}
 			break;
-	
+
 		case kHS39Sign:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -1485,7 +1485,7 @@ void Scene39::run() {
 				}
 			}
 			break;
-	
+
 		case kHS39ExitInsideHouse:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_sceneDone = true;
@@ -1493,13 +1493,13 @@ void Scene39::run() {
 				_vm->_newSceneNum = 38;
 			}
 			break;
-	
+
 		case kHS39WalkArea1:
 		case kHS39WalkArea2:
 			if (_vm->_gnapActionStatus < 0)
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			break;
-			
+
 		default:
 			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
@@ -1507,9 +1507,9 @@ void Scene39::run() {
 			}
 			break;
 		}
-	
+
 		updateAnimations();
-	
+
 		if (!_vm->_isLeavingScene) {
 			if (_vm->_platypusActionStatus < 0)
 				_vm->updatePlatypusIdleSequence();
@@ -1533,16 +1533,16 @@ void Scene39::run() {
 				}
 			}
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 			_vm->_timers[5] = _vm->getRandom(20) + 50;
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -1555,7 +1555,7 @@ void Scene39::updateAnimations() {
 		else
 			_vm->_gnapActionStatus = -1;
 	}
-	
+
 	if (_vm->_gameSys->getAnimationStatus(3) == 2 && _nextGuySequenceId != -1) {
 		_vm->_gameSys->setAnimation(_nextGuySequenceId, 21, 3);
 		_vm->_gameSys->insertSequence(_nextGuySequenceId, 21, _currGuySequenceId, 21, kSeqSyncWait, 0, 0, 0);
diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp
index 1550703e90..d84717e43b 100644
--- a/engines/gnap/scenes/group4.cpp
+++ b/engines/gnap/scenes/group4.cpp
@@ -61,18 +61,18 @@ void Scene40::run() {
 
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
 
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case kHS40Device:
 			_vm->runMenu();
 			updateHotspots();
 			break;
-			
+
 		case kHS40Platypus:
 			if (_vm->_gnapActionStatus < 0) {
 				if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -96,72 +96,72 @@ void Scene40::run() {
 				}
 			}
 			break;
-	
+
 		case kHS40ExitCave:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_newSceneNum = 39;
 				_vm->_sceneDone = true;
 			}
 			break;
-	
+
 		case kHS40ExitToyStand:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_newSceneNum = 41;
 				_vm->_sceneDone = true;
 			}
 			break;
-	
+
 		case kHS40ExitBBQ:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_newSceneNum = 42;
 				_vm->_sceneDone = true;
 			}
 			break;
-	
+
 		case kHS40ExitUfo:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_newSceneNum = 43;
 				_vm->_sceneDone = true;
 			}
 			break;
-	
+
 		case kHS40ExitKissinBooth:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_newSceneNum = 44;
 				_vm->_sceneDone = true;
 			}
 			break;
-	
+
 		case kHS40ExitDancefloor:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_newSceneNum = 45;
 				_vm->_sceneDone = true;
 			}
 			break;
-	
+
 		case kHS40ExitShoe:
 			if (_vm->_gnapActionStatus < 0) {
 				_vm->_newSceneNum = 46;
 				_vm->_sceneDone = true;
 			}
 			break;
-	
+
 		default:
 			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0)
 				_vm->_mouseClickState._left = false;
 			break;
-		
+
 		}
-	
+
 		updateAnimations();
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -244,24 +244,24 @@ void Scene41::run() {
 	gameSys.setAnimation(_vm->_toyUfoSequenceId | 0x10000, _vm->_toyUfoId, 2);
 	gameSys.insertSequence(_vm->_toyUfoSequenceId | 0x10000, _vm->_toyUfoId, 0, 0, kSeqNone, 0, _vm->_toyUfoX - 274, _vm->_toyUfoY - 128);
 	gameSys.insertSequence(0x128, 0, 0, 0, kSeqLoop, 0, 0, 0);
-	
+
 	if (_vm->isFlag(kGFGnapControlsToyUFO))
 		_currKidSequenceId = 0x11B;
 	else
 		_currKidSequenceId = 0x11D;
-	
+
 	_nextKidSequenceId = -1;
-	
+
 	gameSys.setAnimation(_currKidSequenceId, 1, 4);
 	gameSys.insertSequence(_currKidSequenceId, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_currToyVendorSequenceId = 0x118;
 	_nextToyVendorSequenceId = -1;
-	
+
 	gameSys.setAnimation(0x118, 1, 3);
 	gameSys.insertSequence(_currToyVendorSequenceId, 1, 0, 0, kSeqNone, 0, 0, 0);
 	gameSys.insertSequence(0x127, 2, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	if (_vm->isFlag(kGFGnapControlsToyUFO)) {
 		_vm->_gnapSequenceId = 0x120;
 		_vm->_gnapSequenceDatNum = 0;
@@ -297,22 +297,22 @@ void Scene41::run() {
 	while (!_vm->_sceneDone) {
 		if (!_vm->isSoundPlaying(0x1094B))
 			_vm->playSound(0x1094B, true);
-	
+
 		if (!_vm->isFlag(kGFGnapControlsToyUFO)) {
 			_vm->_hotspots[kHS41ToyUfo]._x1 = _vm->_toyUfoX - 25;
 			_vm->_hotspots[kHS41ToyUfo]._y1 = _vm->_toyUfoY - 20;
 			_vm->_hotspots[kHS41ToyUfo]._x2 = _vm->_toyUfoX + 25;
 			_vm->_hotspots[kHS41ToyUfo]._y2 = _vm->_toyUfoY + 20;
 		}
-	
+
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		if (_vm->isFlag(kGFGnapControlsToyUFO)) {
 			switch (_vm->_sceneClickedHotspot) {
 			case kHS41UfoExitLeft:
@@ -323,7 +323,7 @@ void Scene41::run() {
 					_vm->toyUfoFlyTo(-35, -1, -35, 799, 0, 300, 2);
 				}
 				break;
-	
+
 			case kHS41UfoExitRight:
 				if (_vm->_toyUfoActionStatus < 0) {
 					_vm->_isLeavingScene = true;
@@ -332,7 +332,7 @@ void Scene41::run() {
 					_vm->toyUfoFlyTo(835, -1, 0, 835, 0, 300, 2);
 				}
 				break;
-	
+
 			case kHS41UfoDevice:
 				_vm->runMenu();
 				updateHotspots();
@@ -348,7 +348,7 @@ void Scene41::run() {
 				_vm->_timers[4] = _vm->getRandom(100) + 100;
 				_vm->_timers[5] = _vm->getRandom(30) + 20;
 				break;
-	
+
 			case kHS41Platypus:
 				if (_vm->_gnapActionStatus < 0) {
 					if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -372,14 +372,14 @@ void Scene41::run() {
 					}
 				}
 				break;
-	
+
 			case kHS41ExitCave:
 				_vm->_isLeavingScene = true;
 				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS41ExitCave].x, _vm->_hotspotsWalkPos[kHS41ExitCave].y, 0, 0x107AE, 1);
 				_vm->_gnapActionStatus = kAS41LeaveScene;
 				_vm->_newSceneNum = 40;
 				break;
-	
+
 			case kHS41Exit:
 				_vm->_isLeavingScene = true;
 				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS41Exit].x, -1, 0, 0x107AF, 1);
@@ -387,7 +387,7 @@ void Scene41::run() {
 				_vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS41Exit].x, -1, -1, 0x107CF, 1);
 				_vm->_newSceneNum = 45;
 				break;
-	
+
 			case kHS41ExitBBQ:
 				_vm->_isLeavingScene = true;
 				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS41ExitBBQ].x, -1, 0, 0x107AB, 1);
@@ -395,7 +395,7 @@ void Scene41::run() {
 				_vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS41ExitBBQ].x, -1, -1, 0x107CD, 1);
 				_vm->_newSceneNum = 42;
 				break;
-	
+
 			case kHS41ToyVendor:
 				if (_vm->_grabCursorSpriteIndex == kItemDiceQuarterHole) {
 					_vm->_gnapActionStatus = kAS41UseQuarterWithToyVendor;
@@ -422,7 +422,7 @@ void Scene41::run() {
 					}
 				}
 				break;
-	
+
 			case kHS41Kid:
 				if (_vm->_grabCursorSpriteIndex == kItemChickenBucket) {
 					_vm->gnapWalkTo(7, 7, 0, 0x107BB, 1);
@@ -450,7 +450,7 @@ void Scene41::run() {
 					}
 				}
 				break;
-	
+
 			case kHS41ToyUfo:
 				if (_vm->_grabCursorSpriteIndex == kItemGum) {
 					_vm->playGnapPullOutDevice(9, 0);
@@ -458,14 +458,14 @@ void Scene41::run() {
 					_vm->_gnapActionStatus = kAS41UseGumWithToyUfo;
 				}
 				break;
-	
+
 			case kHS41WalkArea1:
 				if (_vm->_gnapActionStatus < 0)
 					_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 				break;
 			}
 		}
-	
+
 		if (_vm->isFlag(kGFGnapControlsToyUFO)) {
 			if (!_vm->_timers[9] && _vm->_gnapActionStatus < 0) {
 				_vm->_gnapActionStatus = kAS41GiveBackToyUfo;
@@ -477,7 +477,7 @@ void Scene41::run() {
 				}
 			}
 		}
-	
+
 		if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
 			_vm->_mouseClickState._left = false;
 			if (_vm->isFlag(kGFGnapControlsToyUFO)) {
@@ -509,7 +509,7 @@ void Scene41::run() {
 		}
 
 		updateAnimations();
-	
+
 		if (!_vm->_isLeavingScene) {
 			if (_vm->_platypusActionStatus < 0)
 				_vm->updatePlatypusIdleSequence();
@@ -545,9 +545,9 @@ void Scene41::run() {
 				}
 			}
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
@@ -660,7 +660,7 @@ void Scene41::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (gameSys.getAnimationStatus(2) == 2) {
 		switch (_vm->_toyUfoActionStatus) {
 		case kAS41ToyUfoLeaveScene:
@@ -685,7 +685,7 @@ void Scene41::updateAnimations() {
 		}
 		_vm->_toyUfoActionStatus = -1;
 	}
-	
+
 	if (gameSys.getAnimationStatus(3) == 2 && _nextToyVendorSequenceId != -1) {
 		gameSys.insertSequence(_nextToyVendorSequenceId, 1, _currToyVendorSequenceId, 1, kSeqSyncWait, 0, 0, 0);
 		gameSys.setAnimation(_nextToyVendorSequenceId, 1, 3);
@@ -693,7 +693,7 @@ void Scene41::updateAnimations() {
 		_nextToyVendorSequenceId = -1;
 		_vm->_timers[4] = _vm->getRandom(100) + 100;
 	}
-	
+
 	if (gameSys.getAnimationStatus(4) == 2 && _nextKidSequenceId != -1) {
 		gameSys.insertSequence(_nextKidSequenceId, 1, _currKidSequenceId, 1, kSeqSyncWait, 0, 0, 0);
 		gameSys.setAnimation(_nextKidSequenceId, 1, 4);
@@ -1193,7 +1193,7 @@ void Scene43::updateHotspots() {
 		_vm->setHotspot(kHS43WalkArea1, 0, 0, 800, 445);
 		_vm->setHotspot(kHS43WalkArea2, 465, 0, 800, 493);
 		_vm->setDeviceHotspot(kHS43Device, -1, -1, -1, -1);
-        if (_vm->isFlag(kGFUnk14))
+		if (_vm->isFlag(kGFUnk14))
 			_vm->_hotspots[kHS43Key]._flags = SF_DISABLED;
 		_vm->_hotspotsCount = 10;
 	}
@@ -1206,13 +1206,13 @@ void Scene43::run() {
 
 	if (!_vm->isFlag(kGFUnk14))
 		gameSys.insertSequence(0x1086F, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_currTwoHeadedGuySequenceId = 0x13C;
 	_nextTwoHeadedGuySequenceId = -1;
-	
+
 	gameSys.setAnimation(0x13C, 1, 2);
 	gameSys.insertSequence(_currTwoHeadedGuySequenceId, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	if (_vm->isFlag(kGFGnapControlsToyUFO)) {
 		_vm->_toyUfoId = 0;
 		_vm->_toyUfoActionStatus = -1;
@@ -1256,19 +1256,19 @@ void Scene43::run() {
 			break;
 		}
 	}
-	
+
 	while (!_vm->_sceneDone) {
 		if (!_vm->isSoundPlaying(0x1094B))
 			_vm->playSound(0x1094B, true);
-	
+
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		if (_vm->isFlag(kGFGnapControlsToyUFO)) {
 			switch (_vm->_sceneClickedHotspot) {
 			case kHS43UfoDevice:
@@ -1276,7 +1276,7 @@ void Scene43::run() {
 				updateHotspots();
 				_vm->_timers[4] = _vm->getRandom(100) + 100;
 				break;
-			
+
 			case kHS43UfoExitLeft:
 				if (_vm->_toyUfoActionStatus < 0) {
 					_vm->_isLeavingScene = true;
@@ -1285,7 +1285,7 @@ void Scene43::run() {
 					_vm->toyUfoFlyTo(-35, -1, -35, 799, 0, 300, 3);
 				}
 				break;
-			
+
 			case kHS43UfoExitRight:
 				if (_vm->_toyUfoActionStatus < 0) {
 					_vm->_isLeavingScene = true;
@@ -1294,7 +1294,7 @@ void Scene43::run() {
 					_vm->toyUfoFlyTo(835, -1, 0, 835, 0, 300, 3);
 				}
 				break;
-			
+
 			case kHS43UfoKey:
 				if (_vm->isFlag(kGFJointTaken)) {
 					_vm->_toyUfoActionStatus = 6;
@@ -1304,7 +1304,7 @@ void Scene43::run() {
 					_vm->toyUfoFlyTo(-1, -1, 0, 799, 0, 300, 3);
 				}
 				break;
-			
+
 			case kHS43UfoBucket:
 				_vm->_toyUfoActionStatus = 7;
 				_vm->toyUfoFlyTo(497, 143, 0, 799, 0, 300, 3);
@@ -1417,7 +1417,7 @@ void Scene43::run() {
 				break;
 			}
 		}
-	
+
 		if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
 			_vm->_mouseClickState._left = false;
 			if (_vm->isFlag(kGFGnapControlsToyUFO) && (_vm->_toyUfoActionStatus == 5 || _vm->_toyUfoActionStatus == -1)) {
@@ -1427,11 +1427,11 @@ void Scene43::run() {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			}
 		}
-	
+
 		updateAnimations();
-	
+
 		_vm->toyUfoCheckTimer();
-	
+
 		if (!_vm->_isLeavingScene) {
 			if (_vm->_platypusActionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO))
 				_vm->updatePlatypusIdleSequence();
@@ -1462,19 +1462,19 @@ void Scene43::run() {
 				}
 			}
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 			_vm->_timers[4] = _vm->getRandom(100) + 100;
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
-	
+
 	if (_vm->_newSceneNum == 54)
 		_vm->clearFlag(kGFGnapControlsToyUFO);
 }
@@ -1513,7 +1513,7 @@ void Scene43::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (gameSys.getAnimationStatus(2) == 2) {
 		if (_currTwoHeadedGuySequenceId == 0x13A) {
 			if (_vm->isFlag(kGFGroceryStoreHatTaken)) {
@@ -1536,7 +1536,7 @@ void Scene43::updateAnimations() {
 			_vm->_timers[4] = _vm->getRandom(100) + 100;
 		}
 	}
-	
+
 	if (gameSys.getAnimationStatus(3) == 2) {
 		switch (_vm->_toyUfoActionStatus) {
 		case 4:
@@ -1644,7 +1644,7 @@ void Scene44::run() {
 		_currSpringGuySequenceId = 0xF8;
 	else
 		_currSpringGuySequenceId = 0xF9;
-	
+
 	_nextSpringGuySequenceId = -1;
 	gameSys.setAnimation(_currSpringGuySequenceId, 1, 4);
 	gameSys.insertSequence(_currSpringGuySequenceId, 1, 0, 0, kSeqNone, 0, 0, 0);
@@ -1664,9 +1664,9 @@ void Scene44::run() {
 		_nextKissingLadySequenceId = -1;
 		gameSys.setAnimation(0xEC, 1, 2);
 	}
-	
+
 	gameSys.insertSequence(_currKissingLadySequenceId, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	if (_vm->isFlag(kGFGnapControlsToyUFO)) {
 		_vm->_toyUfoId = 0;
 		_vm->_toyUfoActionStatus = -1;
@@ -1721,19 +1721,19 @@ void Scene44::run() {
 			break;
 		}
 	}
-	
+
 	while (!_vm->_sceneDone) {
 		if (!_vm->isSoundPlaying(0x1094B))
 			_vm->playSound(0x1094B, true);
-	
+
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		if (_vm->isFlag(kGFGnapControlsToyUFO)) {
 			switch (_vm->_sceneClickedHotspot) {
 			case kHS44UfoExitLeft:
@@ -1767,7 +1767,7 @@ void Scene44::run() {
 				updateHotspots();
 				_vm->_timers[4] = _vm->getRandom(20) + 20;
 				break;
-			
+
 			case kHS44Platypus:
 				if (_vm->_gnapActionStatus < 0) {
 					if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -1798,7 +1798,7 @@ void Scene44::run() {
 				_vm->_gnapActionStatus = 0;
 				_vm->_newSceneNum = 40;
 				break;
-			
+
 			case kHS44ExitUfo:
 				_vm->_isLeavingScene = true;
 				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS44ExitUfo].x, _vm->_gnapY, 0, 0x107AF, 1);
@@ -1806,14 +1806,14 @@ void Scene44::run() {
 				_vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS44ExitUfo].x, _vm->_platY, -1, 0x107CF, 1);
 				_vm->_newSceneNum = 43;
 				break;
-			
+
 			case kHS44ExitShow:
 				_vm->_isLeavingScene = true;
 				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS44ExitShow].x, _vm->_hotspotsWalkPos[kHS44ExitShow].y, 0, 0x107AB, 1);
 				_vm->_gnapActionStatus = 0;
 				_vm->_newSceneNum = 46;
 				break;
-			
+
 			case kHS44KissingLady:
 				if (_vm->_grabCursorSpriteIndex >= 0) {
 					_vm->_gnapActionStatus = 2;
@@ -1843,7 +1843,7 @@ void Scene44::run() {
 					}
 				}
 				break;
-			
+
 			case kHS44Spring:
 				if (_vm->_grabCursorSpriteIndex >= 0) {
 					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS44Spring].x, _vm->_hotspotsWalkPos[kHS44Spring].y, 8, 0);
@@ -1869,7 +1869,7 @@ void Scene44::run() {
 					}
 				}
 				break;
-			
+
 			case kHS44SpringGuy:
 				if (_vm->_grabCursorSpriteIndex >= 0) {
 					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS44SpringGuy].x, _vm->_hotspotsWalkPos[kHS44SpringGuy].y, 8, 0);
@@ -1892,16 +1892,16 @@ void Scene44::run() {
 					}
 				}
 				break;
-			
+
 			case kHS44WalkArea1:
 			case kHS44WalkArea2:
 				if (_vm->_gnapActionStatus < 0)
 					_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 				break;
-			
+
 			}
 		}
-	
+
 		if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
 			_vm->_mouseClickState._left = false;
 			if (_vm->isFlag(kGFGnapControlsToyUFO)) {
@@ -1911,10 +1911,10 @@ void Scene44::run() {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			}
 		}
-	
+
 		updateAnimations();
 		_vm->toyUfoCheckTimer();
-	
+
 		if (!_vm->_isLeavingScene) {
 			if (_vm->_platypusActionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO) && _currKissingLadySequenceId != 0xF5)
 				_vm->updatePlatypusIdleSequence();
@@ -1962,17 +1962,17 @@ void Scene44::run() {
 				}
 			}
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 			_vm->_timers[4] = _vm->getRandom(20) + 20;
 		}
-		
-		_vm->gameUpdateTick();	
+
+		_vm->gameUpdateTick();
 	}
 }
 
@@ -1994,7 +1994,7 @@ void Scene44::updateAnimations() {
 		}
 		_vm->_gnapActionStatus = -1;
 	}
-	
+
 	if (gameSys.getAnimationStatus(1) == 2) {
 		gameSys.setAnimation(0, 0, 1);
 		switch (_vm->_platypusActionStatus) {
@@ -2017,7 +2017,7 @@ void Scene44::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (gameSys.getAnimationStatus(2) == 2) {
 		if (_nextKissingLadySequenceId == 0xF6) {
 			gameSys.insertSequence(_nextKissingLadySequenceId, 1, _currKissingLadySequenceId, 1, kSeqSyncWait, 0, 0, 0);
@@ -2033,7 +2033,7 @@ void Scene44::updateAnimations() {
 			_vm->_timers[4] = _vm->getRandom(20) + 20;
 		}
 	}
-	
+
 	if (gameSys.getAnimationStatus(4) == 2) {
 		if (_currSpringGuySequenceId == 0xFB) {
 			_vm->setGrabCursorSprite(kItemSpring);
@@ -2047,7 +2047,7 @@ void Scene44::updateAnimations() {
 			_vm->_timers[5] = _vm->getRandom(20) + 20;
 		}
 	}
-	
+
 	if (gameSys.getAnimationStatus(3) == 2) {
 		switch (_vm->_toyUfoActionStatus) {
 		case 6:
@@ -2119,7 +2119,7 @@ void Scene45::run() {
 
 	if (!_vm->isSoundPlaying(0x1094A))
 		_vm->playSound(0x1094A, true);
-	
+
 	_vm->queueInsertDeviceIcon();
 
 	gameSys.insertSequence(0x96, 1, 0, 0, kSeqNone, 0, 0, 0);
@@ -2129,7 +2129,7 @@ void Scene45::run() {
 	_currDancerSequenceId = 0x8F;
 	gameSys.setAnimation(_currDancerSequenceId, 1, 2);
 	gameSys.insertSequence(_currDancerSequenceId, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	if (_vm->isFlag(kGFGnapControlsToyUFO)) {
 		_vm->_toyUfoId = 0;
 		_vm->_toyUfoActionStatus = -1;
@@ -2170,7 +2170,7 @@ void Scene45::run() {
 		_vm->platypusWalkTo(4, 8, -1, 0x107C2, 1);
 		_vm->gnapWalkTo(2, 7, -1, 0x107B9, 1);
 	}
-	
+
 	if (!_vm->isFlag(kGFUnk21) && !_vm->isFlag(kGFGnapControlsToyUFO)) {
 		_vm->setFlag(kGFUnk21);
 		_vm->setGrabCursorSprite(-1);
@@ -2209,22 +2209,22 @@ void Scene45::run() {
 		_vm->_gnapSequenceId = 0x7BD;
 		_vm->_gnapSequenceDatNum = 1;
 	}
-	
+
 	_vm->playPlatypusSequence(0x9A);
 	gameSys.setAnimation(_vm->_platypusSequenceId, _vm->_platypusId, 1);
-	
+
 	while (!_vm->_sceneDone) {
 		if (!_vm->isSoundPlaying(0x1094A))
 			_vm->playSound(0x1094A, true);
-	
+
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		if (_vm->isFlag(kGFGnapControlsToyUFO)) {
 			switch (_vm->_sceneClickedHotspot) {
 			case kHS45UfoExitLeft:
@@ -2256,7 +2256,7 @@ void Scene45::run() {
 				_vm->runMenu();
 				updateHotspots();
 				break;
-			
+
 			case kHS45Platypus:
 				if (_vm->_gnapActionStatus < 0) {
 					if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -2291,7 +2291,7 @@ void Scene45::run() {
 					_vm->_newSceneNum = 40;
 				}
 				break;
-			
+
 			case kHS45ExitShoe:
 				if (_vm->_gnapActionStatus < 0) {
 					_vm->_isLeavingScene = true;
@@ -2301,7 +2301,7 @@ void Scene45::run() {
 					_vm->_newSceneNum = 46;
 				}
 				break;
-			
+
 			case kHS45ExitRight:
 				if (_vm->_gnapActionStatus < 0) {
 					_vm->_isLeavingScene = true;
@@ -2342,7 +2342,7 @@ void Scene45::run() {
 					}
 				}
 				break;
-			
+
 			case kHS45WalkArea1:
 				if (_vm->_gnapActionStatus < 0)
 					_vm->gnapWalkTo(-1, -1, -1, -1, 1);
@@ -2359,21 +2359,21 @@ void Scene45::run() {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			}
 		}
-	
+
 		updateAnimations();
 		_vm->toyUfoCheckTimer();
-	
+
 		if (!_vm->_isLeavingScene && _vm->_gnapActionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO))
 			_vm->updateGnapIdleSequence();
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-	
+
 		_vm->gameUpdateTick();
 	}
 
@@ -2403,7 +2403,7 @@ void Scene45::updateAnimations() {
 			break;
 		}
 	}
-	
+
 	if (gameSys.getAnimationStatus(1) == 2) {
 		gameSys.setAnimation(0, 0, 1);
 		if (_vm->getRandom(2) != 0)
@@ -2412,7 +2412,7 @@ void Scene45::updateAnimations() {
 			_vm->playPlatypusSequence(0x9C);
 		gameSys.setAnimation(_vm->_platypusSequenceId, _vm->_platypusId, 1);
 	}
-	
+
 	if (gameSys.getAnimationStatus(2) == 2) {
 		gameSys.setAnimation(0, 0, 2);
 		int newSeqId = _vm->getRandom(7) + 0x8F;
@@ -2420,14 +2420,14 @@ void Scene45::updateAnimations() {
 		gameSys.setAnimation(newSeqId, 1, 2);
 		_currDancerSequenceId = newSeqId;
 	}
-	
+
 	if (gameSys.getAnimationStatus(3) == 2 && gameSys.getAnimationStatus(4) == 2) {
 		gameSys.insertSequence(0x96, 1, 0x96, 1, kSeqSyncWait, 0, 0, 0);
 		gameSys.setAnimation(0x96, 1, 3);
 		gameSys.insertSequence(0x99, 1, 0x99, 1, kSeqSyncWait, 0, 0, 0);
 		gameSys.setAnimation(0x99, 1, 4);
 	}
-	
+
 	if (gameSys.getAnimationStatus(5) == 2) {
 		switch (_vm->_toyUfoActionStatus) {
 		case 2:
@@ -2492,17 +2492,17 @@ void Scene46::run() {
 
 	_vm->queueInsertDeviceIcon();
 	gameSys.insertSequence(0x4D, 0, 0, 0, kSeqLoop, 0, 0, 0);
-	
+
 	_currSackGuySequenceId = 0x4B;
 	_nextSackGuySequenceId = -1;
 	gameSys.setAnimation(0x4B, 1, 3);
 	gameSys.insertSequence(_currSackGuySequenceId, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	_currItchyGuySequenceId = 0x47;
 	_nextItchyGuySequenceId = -1;
 	gameSys.setAnimation(0x47, 1, 4);
 	gameSys.insertSequence(_currItchyGuySequenceId, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
+
 	if (_vm->isFlag(kGFGnapControlsToyUFO)) {
 		_vm->_toyUfoId = 0;
 		_vm->_toyUfoActionStatus = -1;
@@ -2541,15 +2541,15 @@ void Scene46::run() {
 	while (!_vm->_sceneDone) {
 		if (!_vm->isSoundPlaying(0x1094B))
 			_vm->playSound(0x1094B, true);
-	
+
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		if (_vm->isFlag(kGFGnapControlsToyUFO)) {
 			switch (_vm->_sceneClickedHotspot) {
 			case kHS46UfoExitLeft:
@@ -2677,7 +2677,7 @@ void Scene46::run() {
 					break;
 			}
 		}
-	
+
 		if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
 			_vm->_mouseClickState._left = false;
 			if (_vm->isFlag(kGFGnapControlsToyUFO)) {
@@ -2687,10 +2687,10 @@ void Scene46::run() {
 				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
 			}
 		}
-	
+
 		updateAnimations();
 		_vm->toyUfoCheckTimer();
-	
+
 		if (!_vm->_isLeavingScene) {
 			if (_vm->_platypusActionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO))
 				_vm->updatePlatypusIdleSequence();
@@ -2711,15 +2711,15 @@ void Scene46::run() {
 					_nextSackGuySequenceId = 0x4C;
 			}
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
 			updateHotspots();
 		}
-		
+
 		_vm->gameUpdateTick();
 	}
 }
@@ -2742,7 +2742,7 @@ void Scene46::updateAnimations() {
 		}
 		_vm->_gnapActionStatus = -1;
 	}
-	
+
 	if (gameSys.getAnimationStatus(3) == 2 && _nextSackGuySequenceId != -1) {
 		gameSys.insertSequence(_nextSackGuySequenceId, 1, _currSackGuySequenceId, 1, kSeqSyncWait, 0, 0, 0);
 		gameSys.setAnimation(_nextSackGuySequenceId, 1, 3);
@@ -2750,7 +2750,7 @@ void Scene46::updateAnimations() {
 		_nextSackGuySequenceId = -1;
 		_vm->_timers[5] = _vm->getRandom(50) + 80;
 	}
-	
+
 	if (gameSys.getAnimationStatus(4) == 2 && _nextItchyGuySequenceId != -1) {
 		gameSys.insertSequence(_nextItchyGuySequenceId, 1, _currItchyGuySequenceId, 1, kSeqSyncWait, 0, 0, 0);
 		gameSys.setAnimation(_nextItchyGuySequenceId, 1, 4);
@@ -2758,7 +2758,7 @@ void Scene46::updateAnimations() {
 		_nextItchyGuySequenceId = -1;
 		_vm->_timers[4] = _vm->getRandom(50) + 80;
 	}
-	
+
 	if (gameSys.getAnimationStatus(2) == 2) {
 		switch (_vm->_toyUfoActionStatus) {
 		case 3:
diff --git a/engines/gnap/scenes/group5.cpp b/engines/gnap/scenes/group5.cpp
index 3bcab4cfc5..98b26ec8ec 100644
--- a/engines/gnap/scenes/group5.cpp
+++ b/engines/gnap/scenes/group5.cpp
@@ -62,7 +62,7 @@ void Scene53::updateHotspots() {
 
 int Scene53::pressPhoneNumberButton(int phoneNumber, int buttonNum) {
 	static const int kGnapHandSequenceIds[13] = {
-		0x00, 
+		0x00,
 		0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B,
 		0x4C, 0x4D, 0x4E, 0x50, 0x51, 0x4F
 	};
@@ -132,7 +132,7 @@ void Scene53::runRandomCall() {
 		_vm->_gameSys->insertSequence(0x74, 1, 0, 0, kSeqNone, 16, 0, 0);
 		_callsMadeCtr = 0;
 	}
-	
+
 	_vm->_gnapActionStatus = 1;
 	while (_vm->_gameSys->getAnimationStatus(6) != 2) {
 		_vm->updateMouseCursor();
@@ -145,7 +145,7 @@ void Scene53::runRandomCall() {
 void Scene53::runChitChatLine() {
 	bool flag = false;
 	int sequenceId = -1;
-	
+
 	_vm->_gameSys->setAnimation(0x6E, 1, 6);
 	_vm->_gameSys->insertSequence(0x6E, 1, 0, 0, kSeqNone, 16, 0, 0);
 
@@ -164,17 +164,17 @@ void Scene53::runChitChatLine() {
 		_vm->_gameSys->insertSequence(0x45, 40, _currHandSequenceId, 40, kSeqSyncWait, 0, 0, 0);
 		_currHandSequenceId = 0x5E;
 	}
-	
+
 	_vm->_hotspots[kHS53Device]._flags = SF_DISABLED;
-	
+
 	while (!flag) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-		
+
 		switch (_vm->_sceneClickedHotspot) {
 		case 2:
 			sequenceId = 0x6F;
@@ -208,7 +208,7 @@ void Scene53::runChitChatLine() {
 			pressPhoneNumberButton(0, _vm->_sceneClickedHotspot - 1);
 			break;
 		}
-	
+
 		if (flag && sequenceId != -1) {
 			_vm->stopSound(0xA0);
 			pressPhoneNumberButton(0, _vm->_sceneClickedHotspot - 1);
@@ -233,11 +233,11 @@ void Scene53::runChitChatLine() {
 			_vm->_gnapActionStatus = -1;
 		}
 	}
-	
+
 	updateHotspots();
-	
+
 	_vm->_gnapActionStatus = 1;
-	
+
 	if (_vm->isFlag(kGFSpringTaken)) {
 		_vm->_gameSys->setAnimation(0x73, 40, 6);
 		_vm->_gameSys->insertSequence(0x73, 40, _currHandSequenceId, 40, kSeqSyncWait, 0, 0, 0);
@@ -254,9 +254,9 @@ void Scene53::runChitChatLine() {
 void Scene53::run() {
 	int phoneNumber = 0;
 	int phoneNumberLen = 0;
-	
+
 	_vm->queueInsertDeviceIcon();
-	
+
 	if (_vm->isFlag(kGFSpringTaken)) {
 		_currHandSequenceId = 0x45;
 		_isGnapPhoning = true;
@@ -264,21 +264,21 @@ void Scene53::run() {
 		_currHandSequenceId = 0x5E;
 		_isGnapPhoning = false;
 	}
-	
+
 	_vm->_gameSys->insertSequence(_currHandSequenceId, 40, 0, 0, kSeqNone, 0, 0, 0);
 	_vm->endSceneInit();
 	_vm->setVerbCursor(GRAB_CURSOR);
 	_vm->playSound(0xA0, true);
-	
+
 	while (!_vm->_sceneDone) {
 		_vm->updateMouseCursor();
 		_vm->updateCursorByHotspot();
-	
+
 		_vm->testWalk(0, 0, -1, -1, -1, -1);
-	
+
 		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
 		_vm->updateGrabCursorSprite(0, 0);
-	
+
 		switch (_vm->_sceneClickedHotspot) {
 		case 1:
 			if (_vm->_gnapActionStatus < 0) {
@@ -319,7 +319,7 @@ void Scene53::run() {
 					phoneNumberLen = 0;
 					_vm->_sceneDone = true;
 					_vm->_newSceneNum = 17;
-				} else if (phoneNumber != 5556789 || _vm->isFlag(kGFPictureTaken)) {				
+				} else if (phoneNumber != 5556789 || _vm->isFlag(kGFPictureTaken)) {
 					runRandomCall();
 					phoneNumber = 0;
 					phoneNumberLen = 0;
@@ -362,9 +362,9 @@ void Scene53::run() {
 			}
 			break;
 		}
-	
+
 		_vm->checkGameKeys();
-	
+
 		if (_vm->isKeyStatus1(8)) {
 			_vm->clearKeyStatus1(8);
 			_vm->runMenu();
diff --git a/engines/gnap/scenes/groupcs.cpp b/engines/gnap/scenes/groupcs.cpp
index 92491a3847..c096eae27c 100644
--- a/engines/gnap/scenes/groupcs.cpp
+++ b/engines/gnap/scenes/groupcs.cpp
@@ -211,7 +211,7 @@ Scene477::Scene477(GnapEngine *vm) : CutScene(vm) {}
 
 int Scene477::init() {
 	int v0, v4, v2, v3;
-	
+
 	_sequenceIdArr[0] = 0x316;
 	_sequenceIdArr[1] = 0x31A;
 	_sequenceIdArr[2] = 0x314;