TSAGE: Cleanup and bugfixes for the R2R Vent Maze

7 files changed, 87 insertions, 88 deletions

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index a5abb4e105..10ed45f7da 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -465,9 +465,8 @@ void Ringworld2Globals::reset() {
 	_scene1925CurrLevel = 0; //_v56A9C
 	_v56A9E = 0;
 	_v56AA0 = 0;
-	_v56AA1 = 0;
-	_v56AA2 = 60;
-	_v56AA4 = 660;
+	_scientistConvIndex = 0;
+	_ventCellPos = Common::Point(60, 660);
 	_v56AA6 = 1;
 	_v56AA7 = 1;
 	_v56AA8 = 1;
@@ -531,8 +530,8 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_desertWrongDirCtr);
 	s.syncAsSint16LE(_scene1925CurrLevel); // _v56A9C
 	s.syncAsSint16LE(_v56A9E);
-	s.syncAsSint16LE(_v56AA2);
-	s.syncAsSint16LE(_v56AA4);
+	s.syncAsSint16LE(_ventCellPos.x);
+	s.syncAsSint16LE(_ventCellPos.y);
 	s.syncAsSint16LE(_v56AAB);
 	s.syncAsSint16LE(_scene180Mode);
 	s.syncAsSint16LE(_v57709);
@@ -559,7 +558,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsByte(_desertCorrectDirection);
 	s.syncAsByte(_desertPreviousDirection);
 	s.syncAsByte(_v56AA0);
-	s.syncAsByte(_v56AA1);
+	s.syncAsByte(_scientistConvIndex);
 	s.syncAsByte(_v56AA6);
 	s.syncAsByte(_v56AA7);
 	s.syncAsByte(_v56AA8);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 3a8f61bf13..674b907f29 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -290,8 +290,8 @@ public:
 	int _scene1925CurrLevel; //_v56A9C
 	int _v56A9E;
 	byte _v56AA0;
-	byte _v56AA1;
-	int _v56AA2;
+	byte _scientistConvIndex;
+	Common::Point _ventCellPos;
 	int _v56AA4;
 	byte _v56AA6;
 	byte _v56AA7;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index ea083d00f8..ccdaf2ce05 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -118,6 +118,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1100:
 		return new Scene1100();
 	case 1200:
+		// ARM Base - Air Ducts Maze
 		return new Scene1200();
 	case 1337:
 	case 1330:
@@ -1504,7 +1505,7 @@ MazeUI::~MazeUI() {
 }
 
 void MazeUI::synchronize(Serializer &s) {
-	SavedObject::synchronize(s);
+	SceneObject::synchronize(s);
 
 	s.syncAsSint16LE(_resNum);
 	if (s.isLoading())
@@ -1516,7 +1517,6 @@ void MazeUI::synchronize(Serializer &s) {
 }
 
 void MazeUI::load(int resNum) {
-	postInit();
 	clear();
 	_resNum = resNum;
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index a412c5efc6..e2e47ebeb1 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1311,7 +1311,7 @@ void Scene1100::saveCharacter(int characterIndex) {
  *--------------------------------------------------------------------------*/
 
 Scene1200::Scene1200() {
-	_field412 = 0;
+	_nextCrawlDirection = 0;
 	_field414 = 0;
 	_field416 = 0;
 	_field418 = 0;
@@ -1322,7 +1322,7 @@ Scene1200::Scene1200() {
 void Scene1200::synchronize(Serializer &s) {
 	SceneExt::synchronize(s);
 
-	s.syncAsSint16LE(_field412);
+	s.syncAsSint16LE(_nextCrawlDirection);
 	s.syncAsSint16LE(_field414);
 	s.syncAsSint16LE(_field416);
 	s.syncAsSint16LE(_field418);
@@ -1418,7 +1418,7 @@ bool Scene1200::LaserPanel::Jumper::startAction(CursorType action, Event &event)
 
 		switch (R2_GLOBALS._v56AA7) {
 		case 1:
-			setFrame2(1);
+			setFrame2(2);
 			setPosition(Common::Point(152, 101));
 			break;
 		case 2:
@@ -1482,20 +1482,14 @@ void Scene1200::LaserPanel::remove() {
 	Scene1200 *scene = (Scene1200 *)R2_GLOBALS._sceneManager._scene;
 
 	scene->_field41A = 0;
-	warning("Unexpected _sceneAreas.remove() call");
-//	scene->_sceneAreas.remove(&_jumper1);
-//	scene->_sceneAreas.remove(&_jumper2);
-//	scene->_sceneAreas.remove(&_jumper3);
+	scene->_sceneAreas.remove(&_jumper1);
+	scene->_sceneAreas.remove(&_jumper2);
+	scene->_sceneAreas.remove(&_jumper3);
 	_jumper1.remove();
 	_jumper2.remove();
 	_jumper3.remove();
 
-	// sub201EA
-	R2_GLOBALS._sceneItems.remove((SceneItem *)this);
-	_object1.remove();
-	SceneArea::remove();
-	R2_GLOBALS._insetUp--;
-
+	ModalWindow::remove();
 	R2_GLOBALS._player._canWalk = true;
 }
 
@@ -1506,7 +1500,7 @@ void Scene1200::postInit(SceneObjectList *OwnerList) {
 	if (R2_GLOBALS._sceneManager._previousScene < 3200)
 		R2_GLOBALS._sound1.play(257);
 
-	_field412 = 1;
+	_nextCrawlDirection = CRAWL_EAST;
 	_field414 = 0;
 	_field416 = 0;
 	_field418 = 0;
@@ -1533,8 +1527,9 @@ void Scene1200::postInit(SceneObjectList *OwnerList) {
 
 	_mazeUI.setDisplayBounds(Rect(110, 20, 210, 120));
 
+	_mazeUI.postInit();
 	_mazeUI.load(1);
-	_mazeUI.setMazePosition(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
+	_mazeUI.setMazePosition(R2_GLOBALS._ventCellPos);
 
 	R2_GLOBALS._player.enableControl();
 	_item1.setDetails(Rect(0, 0, 320, 200), 1200, 0, 1, 2, 1, NULL);
@@ -1790,7 +1785,7 @@ void Scene1200::process(Event &event) {
 		return;
 
 	if (event.eventType == EVENT_BUTTON_DOWN) {
-		Common::Point cellPos(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);
+		Common::Point cellPos = R2_GLOBALS._ventCellPos;
 		_mazeUI.pixelToCellXY(cellPos);
 
 		int cellId = _mazeUI.getCellFromPixelXY(event.mousePos);
@@ -1840,7 +1835,7 @@ void Scene1200::process(Event &event) {
 						R2_GLOBALS._sceneManager.changeScene(3150);
 						break;
 					case 33:
-						if (R2_GLOBALS._v56AA1 >= 4)
+						if (R2_GLOBALS._scientistConvIndex >= 4)
 							R2_GLOBALS._sceneManager.changeScene(3250);
 						else
 							SceneItem::display(1200, 6, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
@@ -1860,7 +1855,7 @@ void Scene1200::process(Event &event) {
 				case 3:
 					// It was your cell.
 					SceneItem::display(1200, 8, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
-						break;
+					break;
 				case 9:
 						R2_GLOBALS._sceneManager.changeScene(3240);
 						break;
@@ -1914,20 +1909,20 @@ void Scene1200::process(Event &event) {
 		}
 
 		switch (event.kbd.keycode) {
-		case Common::KEYCODE_1:
-			warning("FIXME: keycode = 0x4800");
+		case Common::KEYCODE_KP8:
+		case Common::KEYCODE_UP:
 			startCrawling(CRAWL_NORTH);
 			break;
-		case Common::KEYCODE_2:
-			warning("FIXME: keycode = 0x4B00");
+		case Common::KEYCODE_KP4:
+		case Common::KEYCODE_LEFT:
 			startCrawling(CRAWL_WEST);
 			break;
-		case Common::KEYCODE_3:
-			warning("FIXME: keycode = 0x4D00");
+		case Common::KEYCODE_KP6:
+		case Common::KEYCODE_RIGHT:
 			startCrawling(CRAWL_EAST);
 			break;
-		case Common::KEYCODE_4:
-			warning("FIXME: keycode = 0x5000");
+		case Common::KEYCODE_KP2:
+		case Common::KEYCODE_DOWN:
 			startCrawling(CRAWL_SOUTH);
 			break;
 		default:
@@ -1945,49 +1940,47 @@ void Scene1200::dispatch() {
 	Scene::dispatch();
 
 	if (_fixupMaze) {
-		_mazeUI.setMazePosition(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
-
-		warning("_gfxManager.sub294AC(unk);");
-		warning("tmpRect.sub14DF3();");
+		_mazeUI.setMazePosition(R2_GLOBALS._ventCellPos);
+		//_mazeUI.draw();
 		_fixupMaze = false;
 	}
 
 	if (_field414 != 0) {
 		tmpRect.set(110, 20, 210, 120);
 		_field414--;
-		switch (_field412 - 1) {
-		case 0:
-			R2_GLOBALS._v56AA2 += 2;
+
+		switch (_nextCrawlDirection) {
+		case CRAWL_EAST:
+			R2_GLOBALS._ventCellPos.x += 2;
 			break;
-		case 1:
-			R2_GLOBALS._v56AA2 -= 2;
+		case CRAWL_WEST:
+			R2_GLOBALS._ventCellPos.x -= 2;
 			break;
-		case 2:
-			R2_GLOBALS._v56AA4 += 2;
+		case CRAWL_SOUTH:
+			R2_GLOBALS._ventCellPos.y += 2;
 			break;
-		case 3:
-			R2_GLOBALS._v56AA4 -= 2;
+		case CRAWL_NORTH:
+			R2_GLOBALS._ventCellPos.y -= 2;
 			break;
 		default:
 			break;
 		}
-		_mazeUI.setMazePosition(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
 
-		debug("_gfxManager.sub294AC(unk);");
-		debug("tmpRect.sub14DF3();");
+		_mazeUI.setMazePosition(R2_GLOBALS._ventCellPos);
+		//_mazeUI.draw();
 
 		if (_field416 != 0) {
-			switch(_field412 - 1) {
-			case 0:
+			switch(_nextCrawlDirection) {
+			case CRAWL_EAST:
 				R2_GLOBALS._player.setPosition(Common::Point(R2_GLOBALS._player._position.x - 2, R2_GLOBALS._player._position.y));
 				break;
-			case 1:
+			case CRAWL_WEST:
 				R2_GLOBALS._player.setPosition(Common::Point(R2_GLOBALS._player._position.x + 2, R2_GLOBALS._player._position.y));
 				break;
-			case 2:
+			case CRAWL_SOUTH:
 				R2_GLOBALS._player.setPosition(Common::Point(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y - 2));
 				break;
-			case 3:
+			case CRAWL_NORTH:
 				R2_GLOBALS._player.setPosition(Common::Point(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y + 2));
 				break;
 			default:
@@ -2008,7 +2001,7 @@ void Scene1200::saveCharacter(int characterIndex) {
 }
 
 void Scene1200::startCrawling(CrawlDirection dir) {
-	Common::Point cellPos = Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);
+	Common::Point cellPos = R2_GLOBALS._ventCellPos;
 	_mazeUI.pixelToCellXY(cellPos);
 
 	switch (dir) {
@@ -2023,26 +2016,26 @@ void Scene1200::startCrawling(CrawlDirection dir) {
 			_sceneMode = 1200;
 			setAction(&_sequenceManager, this, 1200, &_actor1, NULL);
 		} else if (_mazeUI.getCellFromPixelXY(Common::Point(200, 69)) == 36) {
-			switch (_field412 - 1) {
-			case 0:
+			switch (_nextCrawlDirection) {
+			case CRAWL_EAST:
 				if (R2_GLOBALS._player._visage == 3155)
 					_sceneMode = 15;
 				else
 					_sceneMode = 10;
 				break;
-			case 1:
+			case CRAWL_WEST:
 				if (R2_GLOBALS._player._visage == 3156)
 					_sceneMode = 76;
 				else
 					_sceneMode = 75;
 				break;
-			case 2:
+			case CRAWL_SOUTH:
 				if (R2_GLOBALS._player._visage == 3156)
 					_sceneMode = 101;
 				else
 					_sceneMode = 100;
 				break;
-			case 3:
+			case CRAWL_NORTH:
 				if (R2_GLOBALS._player._visage == 3156)
 					_sceneMode = 111;
 				else
@@ -2052,7 +2045,7 @@ void Scene1200::startCrawling(CrawlDirection dir) {
 				break;
 			}
 			R2_GLOBALS._player.disableControl();
-			_field412 = 1;
+			_nextCrawlDirection = 1;
 			signal();
 		}
 		break;
@@ -2067,26 +2060,26 @@ void Scene1200::startCrawling(CrawlDirection dir) {
 			_sceneMode = 1201;
 			setAction(&_sequenceManager, this, 1201, &_actor1, NULL);
 		} else if (_mazeUI.getCellFromPixelXY(Common::Point(120, 69)) == 36) {
-			switch (_field412 - 1) {
-			case 0:
+			switch (_nextCrawlDirection) {
+			case CRAWL_EAST:
 				if (R2_GLOBALS._player._visage == 3156)
 					_sceneMode = 56;
 				else
 					_sceneMode = 55;
 				break;
-			case 1:
+			case CRAWL_WEST:
 				if (R2_GLOBALS._player._visage == 3155)
 					_sceneMode = 25;
 				else
 					_sceneMode = 20;
 				break;
-			case 2:
+			case CRAWL_SOUTH:
 				if (R2_GLOBALS._player._visage == 3156)
 					_sceneMode = 91;
 				else
 					_sceneMode = 90;
 				break;
-			case 3:
+			case CRAWL_NORTH:
 				if (R2_GLOBALS._player._visage == 3156)
 					_sceneMode = 121;
 				else
@@ -2096,7 +2089,7 @@ void Scene1200::startCrawling(CrawlDirection dir) {
 				break;
 			}
 			R2_GLOBALS._player.disableControl();
-			_field412 = 2;
+			_nextCrawlDirection = 2;
 			signal();
 		}
 		break;
@@ -2109,26 +2102,26 @@ void Scene1200::startCrawling(CrawlDirection dir) {
 			_sceneMode = 1203;
 			setAction(&_sequenceManager, this, 1203, &_actor1, NULL);
 		} else if (_mazeUI.getCellFromPixelXY(Common::Point(160, 110)) == 36) {
-			switch (_field412 - 1) {
-			case 0:
+			switch (_nextCrawlDirection) {
+			case CRAWL_EAST:
 				if (R2_GLOBALS._player._visage == 3156)
 					_sceneMode = 51;
 				else
 					_sceneMode = 50;
 				break;
-			case 1:
+			case CRAWL_WEST:
 				if (R2_GLOBALS._player._visage == 3156)
 					_sceneMode = 81;
 				else
 					_sceneMode = 80;
 				break;
-			case 2:
+			case CRAWL_SOUTH:
 				if (R2_GLOBALS._player._visage == 3155)
 					_sceneMode = 35;
 				else
 					_sceneMode = 30;
 				break;
-			case 3:
+			case CRAWL_NORTH:
 				if (R2_GLOBALS._player._visage == 3156)
 					_sceneMode = 116;
 				else
@@ -2138,7 +2131,7 @@ void Scene1200::startCrawling(CrawlDirection dir) {
 				break;
 			}
 			R2_GLOBALS._player.disableControl();
-			_field412 = 3;
+			_nextCrawlDirection = 3;
 			signal();
 		}
 		break;
@@ -2151,26 +2144,26 @@ void Scene1200::startCrawling(CrawlDirection dir) {
 			_sceneMode = 1202;
 			setAction(&_sequenceManager, this, 1202, &_actor1, NULL);
 		} else if (_mazeUI.getCellFromPixelXY(Common::Point(160, 30)) == 36) {
-			switch (_field412 - 1) {
-			case 0:
+			switch (_nextCrawlDirection) {
+			case CRAWL_EAST:
 				if (R2_GLOBALS._player._visage == 3156)
 					_sceneMode = 61;
 				else
 					_sceneMode = 60;
 				break;
-			case 1:
+			case CRAWL_WEST:
 				if (R2_GLOBALS._player._visage == 3156)
 					_sceneMode = 71;
 				else
 					_sceneMode = 70;
 				break;
-			case 2:
+			case CRAWL_SOUTH:
 				if (R2_GLOBALS._player._visage == 3156)
 					_sceneMode = 96;
 				else
 					_sceneMode = 95;
 				break;
-			case 3:
+			case CRAWL_NORTH:
 				if (R2_GLOBALS._player._visage == 3155)
 					_sceneMode = 45;
 				else
@@ -2182,7 +2175,7 @@ void Scene1200::startCrawling(CrawlDirection dir) {
 				break;
 			}
 			R2_GLOBALS._player.disableControl();
-			_field412 = 4;
+			_nextCrawlDirection = 4;
 			signal();
 		}
 		break;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index f72260bc00..824df607b3 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -163,7 +163,7 @@ public:
 	MazeUI _mazeUI;
 	SequenceManager _sequenceManager;
 
-	int _field412;
+	int _nextCrawlDirection;
 	int _field414;
 	int _field416;
 	int _field418;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index e70a67d817..a462b5c550 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1065,6 +1065,7 @@ void Scene3240::signal() {
  * Scene 3245 - Cutscene : Discussions with Dr. Tomko
  *
  *--------------------------------------------------------------------------*/
+
 void Scene3245::postInit(SceneObjectList *OwnerList) {
 	loadScene(3245);
 	R2_GLOBALS._uiElements._active = false;
@@ -1080,14 +1081,14 @@ void Scene3245::postInit(SceneObjectList *OwnerList) {
 	_actor1.postInit();
 	_actor2.postInit();
 
-	if (R2_GLOBALS._v56AA1 < 4)
-		++R2_GLOBALS._v56AA1;
+	if (R2_GLOBALS._scientistConvIndex < 4)
+		++R2_GLOBALS._scientistConvIndex;
 
-	if (R2_GLOBALS._v56AA1 >= 4) {
+	if (R2_GLOBALS._scientistConvIndex >= 4) {
 		SceneItem::display(1200, 7, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 		signal();
 	} else {
-		setAction(&_sequenceManager, this, 3244 + R2_GLOBALS._v56AA1, &_actor1, &_actor2, NULL);
+		setAction(&_sequenceManager, this, 3244 + R2_GLOBALS._scientistConvIndex, &_actor1, &_actor2, NULL);
 	}
 }
 
@@ -1099,6 +1100,7 @@ void Scene3245::signal() {
  * Scene 3250 - Room with large stasis field negator
  *
  *--------------------------------------------------------------------------*/
+
 bool Scene3250::Item::startAction(CursorType action, Event &event) {
 	Scene3250 *scene = (Scene3250 *)R2_GLOBALS._sceneManager._scene;
 
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index 23623b1900..58bb8c4a44 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -56,8 +56,13 @@ void SceneManager::setNewScene(int sceneNumber) {
 
 void SceneManager::checkScene() {
 	if (_nextSceneNumber != -1) {
+		int nextSceneNumber = _nextSceneNumber;
+
 		sceneChange();
-		_nextSceneNumber = -1;
+
+		// Unless we've already switched to yet another scene, reset
+		if (_nextSceneNumber == nextSceneNumber)
+			_nextSceneNumber = -1;
 	}
 
 	g_globals->dispatchSounds();