TSAGE: JANITORIAL: Remove trailing spaces

1 files changed, 115 insertions, 115 deletions

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 2b97cba8e9..3dd566c900 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -30,7 +30,7 @@ namespace TsAGE {
 namespace Ringworld2 {
 
 /*--------------------------------------------------------------------------
- * Scene 3100 - 
+ * Scene 3100 -
  *
  *--------------------------------------------------------------------------*/
 Scene3100::Scene3100() {
@@ -131,7 +131,7 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 		_guard.changeZoom(50);
 		_guard.setPosition(Common::Point(10, 149));
 		_guard.setDetails(3100, 6, -1, -1, 2, (SceneItem *)NULL);
-		
+
 		_actor4.postInit();
 		_actor4.setup(3103, 1, 1);
 		_actor4.setPosition(Common::Point(278, 113));
@@ -152,7 +152,7 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 
 		R2_GLOBALS._sound1.play(243);
 	}
-	
+
 	R2_GLOBALS._player._oldCharacterScene[1] = 3100;
 }
 
@@ -322,7 +322,7 @@ void Scene3125::postInit(SceneObjectList *OwnerList) {
 	_actor4.setup(3126, 1, 1);
 	_actor4.setPosition(Common::Point(171, 160));
 	_actor4.fixPriority(201);
-	
+
 	_item3.setDetails(12, 3125, 9, 13, -1);
 	_item2.setDetails(11, 3125, 15, 13, -1);
 	_item1.setDetails(Rect(0, 0, 320, 200), 3125, 0, 1, 2, 1, NULL);
@@ -442,7 +442,7 @@ bool Scene3150::Actor4::startAction(CursorType action, Event &event) {
 	case CURSOR_USE:
 		if (R2_GLOBALS.getFlag(75))
 			return SceneActor::startAction(action, event);
-		
+
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 3151;
 		scene->setAction(&scene->_sequenceManager, scene, 3151, &R2_GLOBALS._player, &scene->_actor4, NULL);
@@ -504,7 +504,7 @@ bool Scene3150::Actor7::startAction(CursorType action, Event &event) {
 		scene->setAction(&scene->_sequenceManager, scene, 3160, &R2_GLOBALS._player, &scene->_actor7, NULL);
 		return true;
 	}
-	
+
 	return SceneActor::startAction(action, event);
 }
 
@@ -554,7 +554,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) {
 
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.disableControl();
-	
+
 	_actor2.postInit();
 	_actor2.setPosition(Common::Point(64, 139));
 	if (R2_GLOBALS.getFlag(78)) {
@@ -686,7 +686,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) {
 			_actor5.postInit();
 			_actor5._effect = 6;
 			_actor5._shade = 3;
-				
+
 			setAction(&_sequenceManager, this, 3156, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor5, NULL);
 		} else {
 			if (R2_GLOBALS._v56AA0 != 2)
@@ -1699,7 +1699,7 @@ void Scene3350::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3375 - 
+ * Scene 3375 -
  *
  *--------------------------------------------------------------------------*/
 Scene3375::Scene3375() {
@@ -1799,13 +1799,13 @@ bool Scene3375::Actor1::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	if (R2_GLOBALS._player._characterIndex == 2)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3304, scene);
-	
+
 	return true;
 }
 
@@ -1814,13 +1814,13 @@ bool Scene3375::Actor2::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	if (R2_GLOBALS._player._characterIndex == 3)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3301, scene);
-	
+
 	return true;
 }
 
@@ -1829,10 +1829,10 @@ bool Scene3375::Actor3::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	scene->_stripManager.start(3303, scene);
-	
+
 	return true;
 }
 
@@ -1841,7 +1841,7 @@ bool Scene3375::Actor4::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_USE)
 		return SceneActor::startAction(action, event);
-	
+
 	if (R2_GLOBALS._v56A9E != 0) {
 		R2_GLOBALS._walkRegions.disableRegion(2);
 		R2_GLOBALS._walkRegions.disableRegion(3);
@@ -1855,10 +1855,10 @@ bool Scene3375::Actor4::startAction(CursorType action, Event &event) {
 	R2_GLOBALS._walkRegions.disableRegion(8);
 
 	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
-	
+
 	scene->_sceneMode = 3375;
 	scene->setAction(&scene->_sequenceManager, scene, 3375, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, &scene->_actor4, NULL);
-	
+
 	return true;
 }
 
@@ -1944,10 +1944,10 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
 	_field148A[1] = 3377;
 	_field148A[2] = 3375;
 	_field148A[3] = 3378;
-	
+
 	loadScene(_field148A[R2_GLOBALS._v56A9E]);
 	SceneExt::postInit();
-	
+
 	R2_GLOBALS._sound1.play(313);
 
 	_stripManager.setColors(60, 255);
@@ -1963,14 +1963,14 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
 
 	setZoomPercents(126, 55, 200, 167);
 	R2_GLOBALS._player.postInit();
-	
+
 	if (R2_GLOBALS._player._characterIndex == 2) {
 		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
 	} else {
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 	}
 	R2_GLOBALS._player.changeZoom(-1);
-	
+
 	switch (R2_GLOBALS._player._characterIndex) {
 	case 2:
 		if (R2_GLOBALS._sceneManager._previousScene == 3385)
@@ -1991,7 +1991,7 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
 			R2_GLOBALS._player.setup(10, 3, 1);
 		break;
 	}
-	
+
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 	R2_GLOBALS._player.disableControl();
 
@@ -2005,21 +2005,21 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
 	}
 	_actor1.changeZoom(-1);
 	_actor1._effect = 1;
-	
+
 	int tmpStrip, tmpVisage;
 	if (R2_GLOBALS._sceneManager._previousScene == 3385)
 		tmpStrip = 1;
 	else
 		tmpStrip = 4;
-	
+
 	if (R2_GLOBALS._player._characterIndex == 2)
 		tmpVisage = 10;
 	else
 		tmpVisage = 20;
-	
+
 	_actor1.setup(tmpVisage, tmpStrip, 1);
 	_actor1.animate(ANIM_MODE_1, NULL);
-	
+
 	_actor2.postInit();
 	_actor2._moveDiff = Common::Point(3, 2);
 	_actor2.changeZoom(-1);
@@ -2033,10 +2033,10 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
 		tmpVisage = 10;
 	else
 		tmpVisage = 30;
-	
+
 	_actor2.setup(tmpVisage, tmpStrip, 1);
 	_actor2.animate(ANIM_MODE_1, NULL);
-	
+
 	_actor3.postInit();
 	_actor3._moveRate = 7;
 	_actor3._moveDiff = Common::Point(5, 3);
@@ -2049,34 +2049,34 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
 
 	_actor3.setup(40, tmpStrip, 1);
 	_actor3.animate(ANIM_MODE_1, NULL);
-	
+
 	_actor2.setDetails(3375, -1, -1, -1, 1, (SceneItem *)NULL);
 	_actor3.setDetails(3375, 21, -1, -1, 1, (SceneItem *)NULL);
 	_actor1.setDetails(3375, -1, -1, -1, 1, (SceneItem *)NULL);
-	
+
 	_actor4.postInit();
 	_actor4.setup(3375, 1, 1);
 	_actor4.setPosition(Common::Point(254, 166));
 	_actor4.fixPriority(140);
 	_actor4.hide();
-	
+
 	_exit1.setDetails(Rect(0, 84, 24, 167), EXITCURSOR_W, 3375);
 	_exit1.setDest(Common::Point(65, 155));
 	_exit2.setDetails(Rect(103, 152, 183, 170), SHADECURSOR_DOWN, 3375);
 	_exit2.setDest(Common::Point(158, 151));
 	_exit3.setDetails(Rect(180, 75, 213, 132), EXITCURSOR_E, 3375);
 	_exit3.setDest(Common::Point(201, 131));
-		
+
 	for (int i = 0; i <= 12; ++i)
 		_itemArray[i].setDetails(i, 3375, 3, -1, -1);
-	
+
 	_item1.setDetails(Rect(0, 0, 320, 200), 3375, 0, -1, 1, 1, NULL);
 
 	if (R2_GLOBALS._sceneManager._previousScene == 3385)
 		_sceneMode = 3379;
 	else
 		_sceneMode = 0;
-	
+
 	subFC696(_sceneMode);
 }
 
@@ -2186,7 +2186,7 @@ void Scene3375::dispatch() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3385 - 
+ * Scene 3385 -
  *
  *--------------------------------------------------------------------------*/
 Scene3385::Scene3385() {
@@ -2204,13 +2204,13 @@ bool Scene3385::Actor1::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	if (R2_GLOBALS._player._characterIndex == 2)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3304, scene);
-	
+
 	return true;
 }
 
@@ -2219,13 +2219,13 @@ bool Scene3385::Actor2::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	if (R2_GLOBALS._player._characterIndex == 3)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3301, scene);
-	
+
 	return true;
 }
 
@@ -2234,10 +2234,10 @@ bool Scene3385::Actor3::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	scene->_stripManager.start(3303, scene);
-	
+
 	return true;
 }
 
@@ -2253,7 +2253,7 @@ bool Scene3385::Actor4::startAction(CursorType action, Event &event) {
 
 	scene->_sceneMode = 3386;
 	scene->setAction(&scene->_sequenceManager, scene, 3386, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, &scene->_actor4, NULL);
-	
+
 	return true;
 }
 
@@ -2303,21 +2303,21 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
 
 	setZoomPercents(102, 40, 200, 160);
 	R2_GLOBALS._player.postInit();
-	
+
 	if (R2_GLOBALS._player._characterIndex == 2)
 		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
 	else
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 
 	R2_GLOBALS._player.changeZoom(-1);
-	
+
 	if (R2_GLOBALS._player._characterIndex == 2)
 		R2_GLOBALS._player.setup(20, _field11B2, 1);
 	else if (R2_GLOBALS._player._characterIndex == 3)
 		R2_GLOBALS._player.setup(30, _field11B2, 1);
 	else
 		R2_GLOBALS._player.setup(10, _field11B2, 1);
-	
+
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 	R2_GLOBALS._player.disableControl();
 
@@ -2337,7 +2337,7 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
 		_actor1.setup(20, _field11B2, 1);
 	_actor1.animate(ANIM_MODE_1, NULL);
 	_actor1.setDetails(3385, -1, -1, -1, 1, (SceneItem *) NULL);
-	
+
 	_actor2.postInit();
 	_actor2._moveDiff = Common::Point(3, 2);
 	_actor2.changeZoom(-1);
@@ -2356,15 +2356,15 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
 	_actor3.setup(40, _field11B2, 1);
 	_actor3.animate(ANIM_MODE_1, NULL);
 	_actor3.setDetails(3385, 15, -1, -1, 1, (SceneItem *) NULL);
-	
+
 	_exit1.setDetails(Rect(103, 152, 217, 170), SHADECURSOR_DOWN, 3395);
 	_exit1.setDest(Common::Point(158, 151));
-	
+
 	_actor4.postInit();
 	_actor4.setPosition(Common::Point(160, 100));
 	_actor4.fixPriority(90);
 	_actor4.setDetails(3385, 3, 4, -1, 1, (SceneItem *) NULL);
-	
+
 	if (R2_GLOBALS._sceneManager._previousScene == 3375) {
 		R2_GLOBALS._player.setPosition(Common::Point(158, 102));
 		_actor1.setPosition(Common::Point(164, 100));
@@ -2385,7 +2385,7 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
 		_actor4.setup(3385, 1, 1);
 		_sceneMode = 3385;
 		setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor3, NULL);
-	}	
+	}
 
 	_item1.setDetails(Rect(0, 0, 320, 200), 3385, 0, -1, -1, 1, NULL);
 	R2_GLOBALS._v56A9E = 0;
@@ -2418,7 +2418,7 @@ void Scene3385::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3395 - 
+ * Scene 3395 -
  *
  *--------------------------------------------------------------------------*/
 Scene3395::Scene3395() {
@@ -2436,13 +2436,13 @@ bool Scene3395::Actor1::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	if (R2_GLOBALS._player._characterIndex == 2)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3304, scene);
-	
+
 	return true;
 }
 
@@ -2451,13 +2451,13 @@ bool Scene3395::Actor2::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	if (R2_GLOBALS._player._characterIndex == 3)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3301, scene);
-	
+
 	return true;
 }
 
@@ -2466,10 +2466,10 @@ bool Scene3395::Actor3::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	scene->_stripManager.start(3303, scene);
-	
+
 	return true;
 }
 
@@ -2485,7 +2485,7 @@ bool Scene3395::Actor4::startAction(CursorType action, Event &event) {
 
 	scene->_sceneMode = 3396;
 	scene->setAction(&scene->_sequenceManager, scene, 3396, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, &scene->_actor4, NULL);
-	
+
 	return true;
 }
 
@@ -2523,21 +2523,21 @@ void Scene3395::postInit(SceneObjectList *OwnerList) {
 
 	setZoomPercents(51, 40, 200, 137);
 	R2_GLOBALS._player.postInit();
-	
+
 	if (R2_GLOBALS._player._characterIndex == 2)
 		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
 	else
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 
 	R2_GLOBALS._player.changeZoom(-1);
-	
+
 	if (R2_GLOBALS._player._characterIndex == 2)
 		R2_GLOBALS._player.setup(20, _field142E, 1);
 	else if (R2_GLOBALS._player._characterIndex == 3)
 		R2_GLOBALS._player.setup(30, _field142E, 1);
 	else
 		R2_GLOBALS._player.setup(10, _field142E, 1);
-	
+
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 	R2_GLOBALS._player.disableControl();
 
@@ -2576,7 +2576,7 @@ void Scene3395::postInit(SceneObjectList *OwnerList) {
 	_actor3.setup(40, _field142E, 1);
 	_actor3.animate(ANIM_MODE_1, NULL);
 	_actor3.setDetails(3385, 18, -1, -1, 1, (SceneItem *) NULL);
-	
+
 	_actor4.postInit();
 	_actor4.setPosition(Common::Point(159, 50));
 	_actor4.fixPriority(40);
@@ -2638,7 +2638,7 @@ void Scene3395::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3400 - 
+ * Scene 3400 -
  *
  *--------------------------------------------------------------------------*/
 Scene3400::Scene3400() {
@@ -2802,7 +2802,7 @@ void Scene3400::signal() {
 		_sceneMode = 3403;
 		if (R2_GLOBALS._player._characterIndex == 2)
 			setAction(&_sequenceManager, this, 3403, &R2_GLOBALS._player, &_actor3, &_actor7, NULL);
-		else 
+		else
 			setAction(&_sequenceManager, this, 3403, &_actor1, &_actor3, &_actor7, NULL);
 		break;
 	case 3309:
@@ -2811,7 +2811,7 @@ void Scene3400::signal() {
 		_sceneMode = 3405;
 		if (R2_GLOBALS._player._characterIndex == 3)
 			setAction(&_sequenceManager, this, 3405, &R2_GLOBALS._player, &_actor7, NULL);
-		else 
+		else
 			setAction(&_sequenceManager, this, 3405, &_actor2, &_actor7, NULL);
 		break;
 	case 3310:
@@ -2885,7 +2885,7 @@ void Scene3400::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3500 - 
+ * Scene 3500 -
  *
  *--------------------------------------------------------------------------*/
 Scene3500::Action1::Action1() {
@@ -2910,10 +2910,10 @@ void Scene3500::Action1::sub108670(int arg1) {
 	_field1E = arg1;
 	_field20 = 1;
 	_field24 = 1;
-	
+
 	scene->_actor9.setStrip(2);
 	scene->_actor9.show();
-	
+
 	if (_field1E == 1)
 		scene->_actor6.show();
 	else
@@ -2954,7 +2954,7 @@ void Scene3500::Action1::sub108732(int arg1) {
 		Common::Point pt(160, 73);
 		NpcMover *mover = new NpcMover();
 		scene->_actor8.addMover(mover, &pt, NULL);
-		
+
 		scene->_fieldB9E = 160 - (_field1E * 2 * 160);
 		Common::Point pt2(scene->_fieldB9E, 73);
 		NpcMover *mover2 = new NpcMover();
@@ -3153,7 +3153,7 @@ void Scene3500::sub107F71(int arg1) {
 			_action1.signal();
 		} else if (_action == 0) {
 			_action1.sub108670(1);
-			setAction(&_action1, &_actor1, NULL);			
+			setAction(&_action1, &_actor1, NULL);
 		}
 		break;
 	case 104:
@@ -3177,7 +3177,7 @@ void Scene3500::sub107F71(int arg1) {
 			_action1.signal();
 		} else if (_action == 0) {
 			_action1.sub108670(-1);
-			setAction(&_action1, &_actor1, NULL);			
+			setAction(&_action1, &_actor1, NULL);
 		}
 		break;
 	default:
@@ -3221,16 +3221,16 @@ void Scene3500::Action1::signal() {
 		int var4 = scene->_unkObj1.sub1097EF(scene->_field127C + 46) - 46;
 		int di = abs(var2 - scene->_field127A);
 		int var6 = abs(var4 - scene->_field127C);
-		
+
 		if ((scene->_actor1._frame % 2) != 0) {
 			scene->_actor1._frameChange = _field1E;
 			scene->_actor1.setFrame(scene->_actor1.changeFrame());
 		}
 
 		int var8 = (scene->_action1._field1E * 2 + scene->_field1276);
-		if (var8 > 7) 
+		if (var8 > 7)
 			var8 = 1;
-		else if (var8 < 1) 
+		else if (var8 < 1)
 			var8 = 7;
 
 		switch (var8) {
@@ -3293,7 +3293,7 @@ void Scene3500::Action1::signal() {
 		Common::Point pt(scene->_fieldAF8, 73);
 		NpcMover *mover = new NpcMover();
 		scene->_actor8.addMover(mover, &pt, this);
-		
+
 		scene->_actor9.setPosition(Common::Point(160 + ((_field1E * 2) * 160), 73));;
 		scene->_actor9._moveDiff.x = 160 - scene->_field126E;
 		scene->_fieldB9E = 160;
@@ -3315,7 +3315,7 @@ void Scene3500::Action1::signal() {
 		else
 			scene->_actor8.setStrip(2);
 		scene->_actor8.fixPriority(1);
-		
+
 		scene->_actor9.setPosition(Common::Point(-160, 73));
 		scene->_actor9.setStrip(9);
 		scene->_actor9.fixPriority(11);
@@ -3343,12 +3343,12 @@ void Scene3500::Action1::signal() {
 		// The following code allows the switch to work properly.
 		warning("Checkme: fix for dead code");
 		int var_8 = (_field1E * 2 + scene->_field1276);
-		if (var_8 > 7) 
+		if (var_8 > 7)
 			var_8 = 1;
-		else if (var_8 < 1) 
+		else if (var_8 < 1)
 			var_8 = 7;
 		//
-		
+
 		switch (var_8 - 1) {
 		case 0:
 		// No break on purpose
@@ -3378,7 +3378,7 @@ void Scene3500::Action1::signal() {
 		Common::Point pt(160, 73);
 		NpcMover *mover = new NpcMover();
 		scene->_actor8.addMover(mover, &pt, NULL);
-		
+
 		scene->_fieldB9E = 160 - (_field1E * 2 * 160);
 		Common::Point pt2(scene->_fieldB9E, 73);
 		NpcMover *mover2 = new NpcMover();
@@ -3419,7 +3419,7 @@ void Scene3500::Action1::dispatch() {
 	if ((_actionIndex == 1) && (scene->_field126E <= 4)) {
 		scene->_rotation->_idxChange = 0;
 		signal();
-	}	
+	}
 }
 
 void Scene3500::Action2::sub10831F(int arg1) {
@@ -3451,12 +3451,12 @@ void Scene3500::Action2::signal() {
 			scene->_fieldB9E = scene->_actor9._position.y;
 			di = scene->_fieldB9E;
 		}
-		
+
 		scene->_actor8._moveDiff.y = 9 - (scene->_field126E / 2);
 		Common::Point pt(si, 73 - (_field1E * 12));
 		NpcMover *mover = new NpcMover();
 		scene->_actor8.addMover(mover, &pt, NULL);
-		
+
 		scene->_actor9._moveDiff.y = 9 - (scene->_field126E / 2);
 		Common::Point pt2(di, 73 - (_field1E * 12));
 		NpcMover *mover2 = new NpcMover();
@@ -3474,7 +3474,7 @@ void Scene3500::Action2::signal() {
 			si = scene->_actor8._position.x;
 			di = scene->_actor9._position.x;
 		}
-		
+
 		scene->_actor7.sub1094ED();
 
 		scene->_actor8._moveDiff.y = 9 - (scene->_field126E / 2);
@@ -3486,7 +3486,7 @@ void Scene3500::Action2::signal() {
 		Common::Point pt2(di, 73);
 		NpcMover *mover2 = new NpcMover();
 		scene->_actor9.addMover(mover2, &pt2, NULL);
-		
+
 		scene->_actor3.setFrame2(2);
 		}
 		break;
@@ -3500,13 +3500,13 @@ bool Scene3500::Item4::startAction(CursorType action, Event &event) {
 
 	if (scene->_field1286 == 0)
 		return true;
-	
+
 	if (scene->_field1286 != 4)
 		return SceneHotspot::startAction(action, event);
-	
+
 	R2_GLOBALS._sound2.play(14);
 	scene->sub107F71(_field34);
-	
+
 	return true;
 }
 
@@ -3515,22 +3515,22 @@ void Scene3500::Actor7::process(Event &event) {
 
 	if (scene->_field1286 == 0)
 		return;
-	
+
 	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_USE) && (_bounds.contains(event.mousePos))) {
 		_fieldAE = 1 + event.mousePos.y - _position.y;
 		event.eventType = EVENT_NONE;
 	}
-	
+
 	if ((event.eventType == EVENT_BUTTON_UP) && (_fieldAE != 0)) {
 		_fieldAE = 0;
 		event.handled = true;
 		if (scene->_action1._field24 == 0)
 			sub1094ED();
 	}
-	
+
 	if (_fieldAE == 0)
 		return;
-	
+
 	R2_GLOBALS._sound2.play(338);
 	event.handled = true;
 
@@ -3550,10 +3550,10 @@ bool Scene3500::Actor7::startAction(CursorType action, Event &event) {
 
 	if (scene->_field1286 == 0)
 		return true;
-	
+
 	if (scene->_field1286 == 4)
 		return false;
-	
+
 	return SceneActor::startAction(action, event);
 }
 
@@ -3586,7 +3586,7 @@ void Scene3500::postInit(SceneObjectList *OwnerList) {
 
 		if (tmpIndex > 254)
 			tmpIndex--;
-		
+
 		tmpPal[3 * i] = R2_GLOBALS._scenePalette._palette[3 * tmpIndex];
 		tmpPal[(3 * i) + 1] = R2_GLOBALS._scenePalette._palette[(3 * tmpIndex) + 1];
 		tmpPal[(3 * i) + 2] = R2_GLOBALS._scenePalette._palette[(3 * tmpIndex) + 2];
@@ -3597,7 +3597,7 @@ void Scene3500::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._scenePalette._palette[(3 * i) + 1] = tmpPal[(3 * i) + 1];
 		R2_GLOBALS._scenePalette._palette[(3 * i) + 2] = tmpPal[(3 * i) + 2];
 	}
-	
+
 	_actor7.sub109466(38, 165, 16, 32, _field1270);
 	_actor7.setDetails(3500, 6, 7, -1, 1, (SceneItem *)NULL);
 	R2_GLOBALS._sound1.play(276);
@@ -3696,7 +3696,7 @@ void Scene3500::signal() {
 void Scene3500::process(Event &event) {
 	if (_field1286 == 0)
 		return;
-	
+
 	if (event.eventType == EVENT_KEYPRESS) {
 		switch (event.kbd.keycode) {
 		case Common::KEYCODE_1:
@@ -3765,7 +3765,7 @@ void Scene3500::process(Event &event) {
 			break;
 		}
 	}
-	
+
 	if (!event.handled)
 		_actor7.process(event);
 
@@ -3864,7 +3864,7 @@ void Scene3500::dispatch() {
 					var_a = abs(var_6 - di);
 					tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
 
-					if ( (((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4)) && (di <= var_6) && (_field127C>= var_6)) 
+					if ( (((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4)) && (di <= var_6) && (_field127C>= var_6))
 						|| (((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5) || (tmpVar == 14) || (tmpVar == 15)) && (_field126E >= var_a) && (_field126E > 3) && (_action1._field24 != 0)) ) {
 						di = var_6;
 						if ((tmpVar != 25) && (tmpVar != 26) && (tmpVar != 5) && (tmpVar != 14) && (tmpVar == 15))
@@ -3894,7 +3894,7 @@ void Scene3500::dispatch() {
 			break;
 		case 2:
 			tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
-			if (  ((tmpVar == 12) || (tmpVar == 13) || (tmpVar == 11) || (tmpVar == 16) || (tmpVar == 31)) 
+			if (  ((tmpVar == 12) || (tmpVar == 13) || (tmpVar == 11) || (tmpVar == 16) || (tmpVar == 31))
 			  || (((tmpVar == 25) || (tmpVar == 23) || (tmpVar == 14) || (tmpVar == 5) || (tmpVar == 4)) && (var_a > 3)) ) {
 				R2_GLOBALS._sound2.play(339);
 				_rotation->_idxChange = 0;
@@ -4003,7 +4003,7 @@ void Scene3500::dispatch() {
 					var_6 = _unkObj1.sub1097EF(di + 46) - 46;
 					var_a = abs(di - var_6);
 					tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
-					if ( (((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5)) && (di >= var_6) && (_field127C <= var_6)) 
+					if ( (((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5)) && (di >= var_6) && (_field127C <= var_6))
 					  || (((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4) || (tmpVar == 14) || (tmpVar == 15)) && (_field126E >= var_a) && (_field126E <= 3) && (_action1._field24 != 0)) ){
 						if ((tmpVar != 23) && (tmpVar != 24) && (tmpVar != 4) && (tmpVar != 14) && (tmpVar != 15))
 							R2_GLOBALS._sound2.play(339);
@@ -4179,7 +4179,7 @@ void Scene3500::dispatch() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3600 - 
+ * Scene 3600 -
  *
  *--------------------------------------------------------------------------*/
 Scene3600::Scene3600() {
@@ -4227,7 +4227,7 @@ void Scene3600::Action3600::signal() {
 			R2_GLOBALS._sound2.fade(127, 5, 10, false, NULL);
 		}
 		setDelay(1);
-		warning("TODO: Palette fader using parameter 2 = 256"); 
+		warning("TODO: Palette fader using parameter 2 = 256");
 		R2_GLOBALS._scenePalette.fade((const byte *)&scene->_palette1._palette, true, _field20);
 		if (_field20 > 0)
 			_field20 -= 2;
@@ -4359,7 +4359,7 @@ void Scene3600::postInit(SceneObjectList *OwnerList) {
 		g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0));
 		R2_GLOBALS._v558B6.set(25, 0, 260, 200);
 	}
-	
+
 	loadScene(3600);
 	SceneExt::postInit();
 	_field254C = 0;
@@ -4502,7 +4502,7 @@ void Scene3600::postInit(SceneObjectList *OwnerList) {
 		_action1._field1E = 1;
 		_action1._field20 = 0;
 		_action1.setActionIndex(1);
-	
+
 		_actor3.setAction(&_action1);
 		_sceneMode = 3623;
 
@@ -4768,7 +4768,7 @@ void Scene3600::signal() {
 			R2_GLOBALS.setFlag(71);
 			_sceneMode = 3626;
 			setAction(&_sequenceManager1, this, 3626, &_actor13, NULL);
-		} 
+		}
 		break;
 	case 3624:
 		R2_GLOBALS._player.disableControl();
@@ -4946,7 +4946,7 @@ void Scene3700::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3800 - 
+ * Scene 3800 -
  *
  *--------------------------------------------------------------------------*/
 Scene3800::Scene3800() {
@@ -5227,7 +5227,7 @@ void Scene3800::postInit(SceneObjectList *OwnerList) {
 	_field412 = 0;
 
 	initScene3800();
-	
+
 	SceneExt::postInit();
 	R2_GLOBALS._sound1.play(231);
 
@@ -5338,7 +5338,7 @@ void Scene3800::process(Event &event) {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3900 - 
+ * Scene 3900 -
  *
  *--------------------------------------------------------------------------*/
 void Scene3900::Exit1::changeScene() {
@@ -5350,7 +5350,7 @@ void Scene3900::Exit1::changeScene() {
 	R2_GLOBALS._v566AA = 1;
 	R2_GLOBALS._v566A8 = 1;
 	scene->_sceneMode = 14;
-	
+
 	Common::Point pt(160, 115);
 	NpcMover *mover = new NpcMover();
 	R2_GLOBALS._player.addMover(mover, &pt, scene);
@@ -5365,7 +5365,7 @@ void Scene3900::Exit2::changeScene() {
 	R2_GLOBALS._v566AA = 2;
 	R2_GLOBALS._v566A8 = 1;
 	scene->_sceneMode = 14;
-	
+
 	Common::Point pt(330, 145);
 	NpcMover *mover = new NpcMover();
 	R2_GLOBALS._player.addMover(mover, &pt, scene);
@@ -5380,7 +5380,7 @@ void Scene3900::Exit3::changeScene() {
 	R2_GLOBALS._v566AA = 3;
 	R2_GLOBALS._v566A8 = 1;
 	scene->_sceneMode = 14;
-	
+
 	Common::Point pt(160, 220);
 	NpcMover *mover = new NpcMover();
 	R2_GLOBALS._player.addMover(mover, &pt, scene);
@@ -5395,7 +5395,7 @@ void Scene3900::Exit4::changeScene() {
 	R2_GLOBALS._v566AA = 4;
 	R2_GLOBALS._v566A8 = 1;
 	scene->_sceneMode = 14;
-	
+
 	Common::Point pt(-10, 145);
 	NpcMover *mover = new NpcMover();
 	R2_GLOBALS._player.addMover(mover, &pt, scene);
@@ -5407,7 +5407,7 @@ void Scene3900::Exit5::changeScene() {
 	_enabled = false;
 	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
 	scene->_sceneMode = 13;
-	
+
 	if (R2_GLOBALS._v566A9 == 4) {
 		Common::Point pt(-10, 135);
 		NpcMover *mover = new NpcMover();