From daa244b73c07ac1e0261632c55a449840cab90f4 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 5 Nov 2013 00:15:37 +0100
Subject: TSAGE: R2R - Fix a couple of issues in scene 1850, some renaming

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 26 ++++++++++++-------------
 engines/tsage/ringworld2/ringworld2_scenes1.h   | 12 ++++++------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 3d99ecd035..ee133edb8e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -11360,7 +11360,7 @@ bool Scene1800::PassengerDoor::startAction(CursorType action, Event &event) {
 	return true;
 }
 
-void Scene1800::Exit1::changeScene() {
+void Scene1800::SouthExit::changeScene() {
 	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
 
 	_enabled = false;
@@ -11843,7 +11843,7 @@ bool Scene1850::Robot::startAction(CursorType action, Event &event) {
 	}
 }
 
-bool Scene1850::Actor6::startAction(CursorType action, Event &event) {
+bool Scene1850::Door::startAction(CursorType action, Event &event) {
 	if (action != CURSOR_USE)
 		return SceneHotspot::startAction(action, event);
 
@@ -11855,7 +11855,7 @@ bool Scene1850::Actor6::startAction(CursorType action, Event &event) {
 	}
 
 	R2_GLOBALS._player.disableControl();
-	if (scene->_field412 == 1851)
+	if (scene->_sceneMode == 1851)
 		R2_GLOBALS._player._effect = 1;
 
 	if (_position.x >= 160)
@@ -11909,7 +11909,7 @@ bool Scene1850::DisplayScreen::startAction(CursorType action, Event &event) {
 /*------------------------------------------------------------------------*/
 
 Scene1850::Scene1850() {
-	_field412 = 0;
+	_sceneMode = 0;
 	_field414 = 0;
 	_field416 = 0;
 	_field418 = 0;
@@ -11919,7 +11919,7 @@ Scene1850::Scene1850() {
 void Scene1850::synchronize(Serializer &s) {
 	SceneExt::synchronize(s);
 
-	s.syncAsSint16LE(_field412);
+	s.syncAsSint16LE(_sceneMode);
 	s.syncAsSint16LE(_field414);
 	s.syncAsSint16LE(_field416);
 	s.syncAsSint16LE(_field418);
@@ -11937,10 +11937,10 @@ void Scene1850::postInit(SceneObjectList *OwnerList) {
 	_palette1.loadPalette(0);
 
 	if (R2_GLOBALS.getFlag(31)) {
-		_field412 = 1850;
+		_sceneMode = 1850;
 		g_globals->_scenePalette.loadPalette(1850);
 	} else {
-		_field412 = 1851;
+		_sceneMode = 1851;
 		g_globals->_scenePalette.loadPalette(1851);
 	}
 
@@ -12268,14 +12268,14 @@ void Scene1850::signal() {
 	case 1852:
 	// No break on purpose:
 	case 1853:
-		if (_field412 == 1851) {
+		if (_sceneMode == 1851) { // At this point, SceneMode can't be equal to 1851 => dead code
 			R2_GLOBALS.setFlag(31);
 			_palette1.loadPalette(1850);
-			_field412 = 1850;
+			_sceneMode = 1850;
 		} else {
 			R2_GLOBALS.clearFlag(31);
 			_palette1.loadPalette(1851);
-			_field412 = 1851;
+			_sceneMode = 1851;
 		}
 
 		_field418 = 1;
@@ -12292,7 +12292,7 @@ void Scene1850::signal() {
 		} else if (R2_GLOBALS.getFlag(33)) {
 				R2_GLOBALS.setFlag(62);
 				R2_GLOBALS.setFlag(34);
-				R2_GLOBALS._walkRegions.disableRegion(2);
+				R2_GLOBALS._walkRegions.enableRegion(2);
 
 				_actor2.postInit();
 				_actor2.setDetails(1850, 6, -1, -1, 5, &_robot);
@@ -12309,7 +12309,7 @@ void Scene1850::signal() {
 		else
 			R2_GLOBALS._scenePalette.addFader(_palette1._palette, 256, 5, this);
 
-		if (_field412 == 1851)
+		if (_sceneMode == 1851)
 			_field416 = -20;
 		else
 			_field416 = 20;
@@ -12469,7 +12469,7 @@ void Scene1850::process(Event &event) {
 		} else {
 			setAction(&_sequenceManager1, this, 1859, &R2_GLOBALS._player, &_robot, NULL);
 		}
-		R2_GLOBALS.clearFlag(32);
+		R2_GLOBALS.clearFlag(30);
 		event.handled = true;
 	}
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index a663fbe5bc..c9b6244cb4 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -861,7 +861,7 @@ class Scene1800 : public SceneExt {
 		virtual bool startAction(CursorType action, Event &event);
 	};
 
-	class Exit1 : public SceneExit {
+	class SouthExit : public SceneExit {
 	public:
 		virtual void changeScene();
 	};
@@ -883,7 +883,7 @@ public:
 	Doors _doors;
 	PassengerDoor _leftDoor;
 	PassengerDoor _rightDoor;
-	Exit1 _southExit;
+	SouthExit _southExit;
 	SequenceManager _sequenceManager;
 
 	Scene1800();
@@ -904,7 +904,7 @@ class Scene1850 : public SceneExt {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
-	class Actor6 : public SceneActor {
+	class Door : public SceneActor {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
@@ -914,7 +914,7 @@ class Scene1850 : public SceneExt {
 	};
 
 public:
-	int _field412;
+	int _sceneMode;
 	int _field414;
 	int _field416;
 	int _field418;
@@ -930,8 +930,8 @@ public:
 	SceneActor _actor3;
 	SceneActor _actor4;
 	Robot _robot;
-	Actor6 _leftDoor;
-	Actor6 _rightDoor;
+	Door _leftDoor;
+	Door _rightDoor;
 	DisplayScreen _displayScreen;
 	SequenceManager _sequenceManager1;
 	SequenceManager _sequenceManager2;
-- 
cgit v1.2.3