TSAGE: Further bugfixes and renaming for R2R shaft bottom

scummvm · Sep 19, 2013 · 05b877d · 05b877d
1 parent 5ea8e28
commit 05b877d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -13373,7 +13373,7 @@ void Scene1945::ExitUp::changeScene() {
 	}
 }
 
-void Scene1945::Exit2::changeScene() {
+void Scene1945::CorridorExit::changeScene() {
 	Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
 
 	_moving = false;
@@ -13404,12 +13404,12 @@ void Scene1945::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player._characterIndex = R2_SEEKER;
 
 	_exitUp.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1945);
-	_exit2.setDetails(Rect(238, 144, 274, 167), EXITCURSOR_E, 1945);
+	_corridorExit.setDetails(Rect(238, 144, 274, 167), EXITCURSOR_E, 1945);
 
 	_ladder.setDetails(Rect(141, 3, 167, 126), 1945, 9, -1, -1, 1, NULL);
 
 	if (!R2_GLOBALS.getFlag(43)) {
-		_exit2._enabled = false;
+		_corridorExit._enabled = false;
 		_gunpowder.postInit();
 		_gunpowder.setup(1945, 4, 1);
 		_gunpowder.setPosition(Common::Point(253, 169));
@@ -13429,7 +13429,7 @@ void Scene1945::postInit(SceneObjectList *OwnerList) {
 		_actor2.setup(1945, 3, 1);
 		_actor2.hide();
 	} else {
-		_exit2._enabled = true;
+		_corridorExit._enabled = true;
 	}
 
 	switch (R2_GLOBALS._sceneManager._previousScene) {
@@ -13525,10 +13525,10 @@ void Scene1945::signal() {
 		return;
 	case 1948:
 		R2_GLOBALS._sound1.play(220);
-		_exit2._enabled = true;
+		_corridorExit._enabled = true;
 		R2_GLOBALS._sceneItems.remove(&_gunpowder);
 		R2_GLOBALS.clearFlag(42);
-		R2_GLOBALS.clearFlag(43);
+		R2_GLOBALS.setFlag(43);
 		_nextSceneMode1 = 1940;
 	// No break on purpose
 	case 1949:

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -1078,7 +1078,7 @@ class Scene1945 : public SceneExt {
 	public:
 		virtual void changeScene();
 	};
-	class Exit2 : public SceneExit {
+	class CorridorExit : public SceneExit {
 	public:
 		virtual void changeScene();
 	};
@@ -1091,7 +1091,7 @@ class Scene1945 : public SceneExt {
 	SceneActor _actor2;
 	Gunpowder _gunpowder;
 	ExitUp _exitUp;
-	Exit2 _exit2;
+	CorridorExit _corridorExit;
 	SequenceManager _sequenceManager1;
 	SequenceManager _sequenceManager2;