TSAGE: Bugfixes and renaming for entering ARM hanger, and more for Spill Mountains

5 files changed, 70 insertions, 70 deletions

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 0941f09677..aab6c8ad6e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -68,7 +68,7 @@ void Scene1000::postInit(SceneObjectList *OwnerList) {
 		_sceneMode = 100;
 		break;
 	case 2800:
-		_sceneMode = 2800;
+		_sceneMode = 70;
 		break;
 	case 3100:
 		if (R2_GLOBALS._player._oldCharacterScene[R2_QUINN] == 1000)
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index c6a4729b7a..a8fc6eae49 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -1294,9 +1294,9 @@ bool Scene2425::Item1::startAction(CursorType action, Event &event) {
 		R2_GLOBALS.setFlag(84);
 		return true;
 	} else if (action == R2_GUNPOWDER) {
-		R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
-		R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS);
-		return NamedHotspot::startAction(R2_STEPPING_DISKS, event);
+		R2_GLOBALS._events.setCursor(CURSOR_USE);
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		return NamedHotspot::startAction(CURSOR_USE, event);
 	} else
 		return NamedHotspot::startAction(action, event);
 }
@@ -1311,9 +1311,9 @@ bool Scene2425::Item2::startAction(CursorType action, Event &event) {
 		R2_GLOBALS.clearFlag(84);
 		return true;
 	} else if (action == R2_GUNPOWDER) {
-		R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
-		R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS);
-		return NamedHotspot::startAction(R2_STEPPING_DISKS, event);
+		R2_GLOBALS._events.setCursor(CURSOR_USE);
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		return NamedHotspot::startAction(CURSOR_USE, event);
 	} else
 		return NamedHotspot::startAction(action, event);
 }
@@ -1341,15 +1341,15 @@ bool Scene2425::Item4::startAction(CursorType action, Event &event) {
 	if (action != R2_GUNPOWDER)
 		return NamedHotspot::startAction(action, event);
 	else {
-		R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
-		R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS);
-		return NamedHotspot::startAction(R2_STEPPING_DISKS, event);
+		R2_GLOBALS._events.setCursor(CURSOR_USE);
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		return NamedHotspot::startAction(CURSOR_USE, event);
 	}
 }
 
 bool Scene2425::Actor1::startAction(CursorType action, Event &event) {
 	if (action == R2_STEPPING_DISKS) {
-		if (R2_GLOBALS._player._characterIndex == 2) {
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
 			R2_GLOBALS._events.setCursor(R2_GUNPOWDER);
 			return true;
 		} else {
@@ -1365,9 +1365,9 @@ bool Scene2425::Actor2::startAction(CursorType action, Event &event) {
 	if (action != R2_GUNPOWDER)
 		return SceneActor::startAction(action, event);
 	else {
-		R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
-		R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS);
-		return SceneActor::startAction(R2_STEPPING_DISKS, event);
+		R2_GLOBALS._events.setCursor(CURSOR_USE);
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		return SceneActor::startAction(CURSOR_USE, event);
 	}
 }
 
@@ -1503,27 +1503,27 @@ bool Scene2430::Actor1::startAction(CursorType action, Event &event) {
 	return SceneActor::startAction(action, event);
 }
 
-bool Scene2430::Actor2::startAction(CursorType action, Event &event) {
+bool Scene2430::GunPowder::startAction(CursorType action, Event &event) {
 	Scene2430 *scene = (Scene2430 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((action != R2_STEPPING_DISKS) || (R2_GLOBALS._player._characterIndex != 2))
+	if ((action != CURSOR_USE) || (R2_GLOBALS._player._characterIndex != 2))
 		return SceneActor::startAction(action, event);
 
 	R2_GLOBALS._player.disableControl();
 	scene->_sceneMode = 2430;
-	scene->setAction(&scene->_sequenceManager, scene, 2430, &R2_GLOBALS._player, &scene->_actor2, NULL);
+	scene->setAction(&scene->_sequenceManager, scene, 2430, &R2_GLOBALS._player, &scene->_gunPowder, NULL);
 	return true;
 }
 
-bool Scene2430::Actor3::startAction(CursorType action, Event &event) {
+bool Scene2430::OilLamp::startAction(CursorType action, Event &event) {
 	Scene2430 *scene = (Scene2430 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((action != R2_STEPPING_DISKS) || (R2_GLOBALS._player._characterIndex != 2))
+	if ((action != CURSOR_USE) || (R2_GLOBALS._player._characterIndex != 2))
 		return SceneActor::startAction(action, event);
 
 	R2_GLOBALS._player.disableControl();
 	scene->_sceneMode = 2435;
-	scene->setAction(&scene->_sequenceManager, scene, 2435, &R2_GLOBALS._player, &scene->_actor3, NULL);
+	scene->setAction(&scene->_sequenceManager, scene, 2435, &R2_GLOBALS._player, &scene->_oilLamp, NULL);
 	return true;
 }
 
@@ -1546,18 +1546,18 @@ void Scene2430::postInit(SceneObjectList *OwnerList) {
 	_exit1.setDest(Common::Point(108, 160));
 
 	if (R2_INVENTORY.getObjectScene(R2_GUNPOWDER) == 2430) {
-		_actor2.postInit();
-		_actor2.setup(2435, 1, 5);
-		_actor2.setPosition(Common::Point(205, 119));
-		_actor2.fixPriority(152);
-		_actor2.setDetails(2430, 51, -1, 53, 1, (SceneItem *)NULL);
+		_gunPowder.postInit();
+		_gunPowder.setup(2435, 1, 5);
+		_gunPowder.setPosition(Common::Point(205, 119));
+		_gunPowder.fixPriority(152);
+		_gunPowder.setDetails(2430, 51, -1, 53, 1, (SceneItem *)NULL);
 	}
 
 	if (R2_INVENTORY.getObjectScene(R2_ALCOHOL_LAMP_3) == 2435) {
-		_actor3.postInit();
-		_actor3.setup(2435, 1, 1);
-		_actor3.setPosition(Common::Point(31, 65));
-		_actor3.setDetails(2430, 48, -1, -1, 1, (SceneItem *)NULL);
+		_oilLamp.postInit();
+		_oilLamp.setup(2435, 1, 1);
+		_oilLamp.setPosition(Common::Point(31, 65));
+		_oilLamp.setDetails(2430, 48, -1, -1, 1, (SceneItem *)NULL);
 	}
 
 	R2_GLOBALS._player.postInit();
@@ -1618,12 +1618,12 @@ void Scene2430::signal() {
 		g_globals->_sceneManager.changeScene(2000);
 		break;
 	case 2430:
-		_actor2.remove();
+		_gunPowder.remove();
 		R2_INVENTORY.setObjectScene(R2_GUNPOWDER, 2);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 2435:
-		_actor3.remove();
+		_oilLamp.remove();
 		R2_INVENTORY.setObjectScene(R2_ALCOHOL_LAMP_3, 2);
 		R2_GLOBALS._player.enableControl();
 		break;
@@ -1803,13 +1803,13 @@ bool Scene2440::Actor1::startAction(CursorType action, Event &event) {
 	return SceneActor::startAction(action, event);
 }
 
-bool Scene2440::Actor2::startAction(CursorType action, Event &event) {
+bool Scene2440::OilLamp::startAction(CursorType action, Event &event) {
 	Scene2440 *scene = (Scene2440 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((action == CURSOR_USE) && (R2_GLOBALS._player._characterIndex == 2)){
+	if ((action == CURSOR_USE) && (R2_GLOBALS._player._characterIndex == R2_SEEKER)) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 2440;
-		scene->setAction(&scene->_sequenceManager, scene, 2440, &R2_GLOBALS._player, &scene->_actor2, NULL);
+		scene->setAction(&scene->_sequenceManager, scene, 2440, &R2_GLOBALS._player, &scene->_oilLamp, NULL);
 		return true;
 	}
 
@@ -1835,11 +1835,11 @@ void Scene2440::postInit(SceneObjectList *OwnerList) {
 	_exit1.setDetails(Rect(172, 155, 250, 167), EXITCURSOR_SE, 2000);
 	_exit1.setDest(Common::Point(210, 160));
 	if (R2_INVENTORY.getObjectScene(R2_ALCOHOL_LAMP_2) == 2440) {
-		_actor2.postInit();
-		_actor2.setup(2435, 1, 1);
-		_actor2.setPosition(Common::Point(94, 80));
-		_actor2.fixPriority(106);
-		_actor2.setDetails(2430, 48, -1, -1, 1, (SceneItem *)NULL);
+		_oilLamp.postInit();
+		_oilLamp.setup(2435, 1, 1);
+		_oilLamp.setPosition(Common::Point(94, 80));
+		_oilLamp.fixPriority(106);
+		_oilLamp.setDetails(2430, 48, -1, -1, 1, (SceneItem *)NULL);
 	}
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.enableControl();
@@ -1898,7 +1898,7 @@ void Scene2440::signal() {
 		g_globals->_sceneManager.changeScene(2000);
 		break;
 	case 2440:
-		_actor2.remove();
+		_oilLamp.remove();
 		R2_INVENTORY.setObjectScene(R2_ALCOHOL_LAMP_2, 2);
 	// No break on purpose
 	default:
@@ -1965,7 +1965,7 @@ bool Scene2450::CareTaker::startAction(CursorType action, Event &event) {
 void Scene2450::Exit1::changeScene() {
 	Scene2450 *scene = (Scene2450 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((R2_GLOBALS._player._characterIndex == 2) || (R2_GLOBALS.getFlag(61))) {
+	if ((R2_GLOBALS._player._characterIndex == R2_SEEKER) || (R2_GLOBALS.getFlag(61))) {
 		_enabled = false;
 		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		R2_GLOBALS._player.disableControl();
@@ -2526,7 +2526,7 @@ bool Scene2525::Actor3::startAction(CursorType action, Event &event) {
 	if (action != CURSOR_USE)
 		return SceneActor::startAction(action, event);
 
-	if (R2_GLOBALS._player._characterIndex == 2) {
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 2525;
 		scene->setAction(&scene->_sequenceManager, scene, 2525, &R2_GLOBALS._player, &scene->_actor3, NULL);
@@ -2653,7 +2653,7 @@ bool Scene2530::Actor2::startAction(CursorType action, Event &event) {
 	if (action != CURSOR_USE)
 		return SceneActor::startAction(action, event);
 
-	if (R2_GLOBALS._player._characterIndex == 2) {
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 2530;
 		scene->setAction(&scene->_sequenceManager, scene, 2530, &R2_GLOBALS._player, &scene->_actor2, NULL);
@@ -2830,7 +2830,7 @@ bool Scene2535::TannerMask::startAction(CursorType action, Event &event) {
 	if (action != CURSOR_USE)
 		return SceneActor::startAction(action, event);
 
-	if (R2_GLOBALS._player._characterIndex == 2) {
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 2535;
 		scene->setAction(&scene->_sequenceManager, scene, 2535, &R2_GLOBALS._player, &scene->_tannerMask, NULL);
@@ -4179,7 +4179,7 @@ void Scene2800::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_field412);
 }
 
-bool Scene2800::Item2::startAction(CursorType action, Event &event) {
+bool Scene2800::Outpost::startAction(CursorType action, Event &event) {
 	Scene2800 *scene = (Scene2800 *)R2_GLOBALS._sceneManager._scene;
 
 	if ((action == CURSOR_USE) && (R2_GLOBALS.getFlag(47))) {
@@ -4469,7 +4469,7 @@ void Scene2800::postInit(SceneObjectList *OwnerList) {
 	if (R2_INVENTORY.getObjectScene(R2_FLUTE) == 0) {
 		R2_GLOBALS._sound1.fadeSound(237);
 		if (R2_GLOBALS.getFlag(47)) {
-			_item2.setDetails(Rect(76, 45, 155, 90), 2800, 3, -1, -1, 2, NULL);
+			_outpost.setDetails(Rect(76, 45, 155, 90), 2800, 3, -1, -1, 2, NULL);
 		} else {
 			_actor2.postInit();
 			_actor2.setup(2752, 5, 1);
@@ -4516,7 +4516,7 @@ void Scene2800::signal() {
 		_object1.setAction(NULL);
 		R2_GLOBALS._player.enableControl(CURSOR_WALK);
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
-		_item2.setDetails(Rect(76, 45, 155, 90), 2800, 3, -1, -1, 2, NULL);
+		_outpost.setDetails(Rect(76, 45, 155, 90), 2800, 3, -1, -1, 2, NULL);
 		break;
 	case 12:
 		R2_GLOBALS._sound1.fadeOut2(NULL);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index 819513e7ec..90dd97a5e4 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -192,11 +192,11 @@ class Scene2430 : public SceneExt {
 	public:
 		bool startAction(CursorType action, Event &event);
 	};
-	class Actor2 : public SceneActor {
+	class GunPowder : public SceneActor {
 	public:
 		bool startAction(CursorType action, Event &event);
 	};
-	class Actor3 : public SceneActor {
+	class OilLamp : public SceneActor {
 	public:
 		bool startAction(CursorType action, Event &event);
 	};
@@ -220,8 +220,8 @@ public:
 	NamedHotspot _item12;
 	NamedHotspot _item13;
 	Actor1 _actor1;
-	Actor2 _actor2;
-	Actor3 _actor3;
+	GunPowder _gunPowder;
+	OilLamp _oilLamp;
 	Exit1 _exit1;
 	SequenceManager _sequenceManager;
 
@@ -265,7 +265,7 @@ class Scene2440 : public SceneExt {
 	public:
 		bool startAction(CursorType action, Event &event);
 	};
-	class Actor2 : public SceneActor {
+	class OilLamp : public SceneActor {
 	public:
 		bool startAction(CursorType action, Event &event);
 	};
@@ -283,7 +283,7 @@ public:
 	NamedHotspot _item6;
 	NamedHotspot _item7;
 	Actor1 _actor1;
-	Actor2 _actor2;
+	OilLamp _oilLamp;
 	Exit1 _exit1;
 	SequenceManager _sequenceManager;
 
@@ -627,7 +627,7 @@ public:
 };
 
 class Scene2800 : public SceneExt {
-	class Item2 : public NamedHotspot {
+	class Outpost : public NamedHotspot {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
@@ -652,7 +652,7 @@ public:
 	SpeakerNej2800 _nejSpeaker;
 	SpeakerGuard2800 _guardSpeaker;
 	NamedHotspot _item1;
-	Item2 _item2;
+	Outpost _outpost;
 	Guard _guard;
 	SceneActor _actor2;
 	SceneActor _actor3;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index d8922f0839..233e83effd 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -30,9 +30,10 @@ namespace TsAGE {
 namespace Ringworld2 {
 
 /*--------------------------------------------------------------------------
- * Scene 3100 -
+ * Scene 3100 - ARM Base Hanager
  *
  *--------------------------------------------------------------------------*/
+
 Scene3100::Scene3100() {
 	_field412 = 0;
 }
@@ -63,7 +64,7 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 			R2_GLOBALS._uiElements._active = false;
 		} else {
 			loadScene(3100);
-			g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0));
+			_sceneBounds = Rect(160, 0, 480, SCREEN_HEIGHT);
 		}
 	} else {
 		loadScene(3100);
@@ -148,7 +149,7 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 		R2_GLOBALS._player.setPosition(Common::Point(160, 150));
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
-		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
 
 		R2_GLOBALS._sound1.play(243);
 	}
@@ -172,7 +173,7 @@ void Scene3100::signal() {
 	case 3100:
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 		R2_GLOBALS._scrollFollower = &R2_GLOBALS._player;
-		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
 		break;
 	case 3101:
 		R2_GLOBALS._sceneManager.changeScene(1000);
@@ -182,7 +183,7 @@ void Scene3100::signal() {
 		R2_GLOBALS._sceneManager.changeScene(1000);
 		break;
 	default:
-		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
 		break;
 	}
 }
@@ -2119,7 +2120,7 @@ void Scene3375::signalCase3379() {
 	_actor1._effect = 1;
 	_actor2._effect = 1;
 	_actor3._effect = 1;
-	R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+	R2_GLOBALS._player.enableControl(CURSOR_WALK);
 }
 
 void Scene3375::signal() {
@@ -2412,7 +2413,7 @@ void Scene3385::signal() {
 		R2_GLOBALS._player.enableControl(CURSOR_TALK);
 		break;
 	default:
-		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
 		break;
 	}
 }
@@ -2632,7 +2633,7 @@ void Scene3395::signal() {
 		R2_GLOBALS._player.enableControl(CURSOR_TALK);
 		break;
 	default:
-		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
 		break;
 	}
 }
@@ -4511,7 +4512,7 @@ void Scene3600::postInit(SceneObjectList *OwnerList) {
 		_sceneMode = 3623;
 
 		g_globals->_events.setCursor(CURSOR_ARROW);
-		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
 	} else {
 		_field254A = 0;
 		_field2548 = 0;
@@ -4630,14 +4631,14 @@ void Scene3600::signal() {
 	// No break on purpose
 	case 3607:
 		g_globals->_events.setCursor(CURSOR_ARROW);
-		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
 		_actor13.fixPriority(-1);
 		_sceneMode = 3623;
 		_field2548 = 1;
 		break;
 	case 3327:
 		g_globals->_events.setCursor(CURSOR_ARROW);
-		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
 		_sceneMode = 3623;
 		break;
 	case 3450:
@@ -5188,7 +5189,7 @@ void Scene3800::enterArea() {
 				break;
 			}
 		default:
-			R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+			R2_GLOBALS._player.enableControl(CURSOR_WALK);
 			break;
 		}
 		break;
@@ -5554,7 +5555,7 @@ void Scene3900::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._player.addMover(mover, &pt, this);
 	} else {
 		R2_GLOBALS._player.setPosition(Common::Point(160, 145));
-		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
 	}
 }
 
@@ -5585,7 +5586,7 @@ void Scene3900::signal() {
 		_eastExit._enabled = true;
 		_southExit._enabled = true;
 		_westExit._enabled = true;
-		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
 		break;
 	default:
 		break;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 14600ff6df..f1203f96a1 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -45,7 +45,6 @@ class Scene3100 : public SceneExt {
 		virtual bool startAction(CursorType action, Event &event);
 	};
 public:
-
 	int _field412;
 	SpeakerGuard _guardSpeaker;
 	NamedHotspot _item1;