[Scummvm-cvs-logs] scummvm master -> 285cbedb77230904861e419a9f7737a619c88ab7

Strangerke Strangerke at scummvm.org
Wed Nov 6 01:35:40 CET 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
285cbedb77 TSAGE: R2R - Renaming in scene 2450


Commit: 285cbedb77230904861e419a9f7737a619c88ab7
    https://github.com/scummvm/scummvm/commit/285cbedb77230904861e419a9f7737a619c88ab7
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-05T16:35:06-08:00

Commit Message:
TSAGE: R2R - Renaming in scene 2450

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes2.cpp
    engines/tsage/ringworld2/ringworld2_scenes2.h



diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 3073253..25b4587 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -1958,7 +1958,7 @@ bool Scene2450::CareTaker::startAction(CursorType action, Event &event) {
 	}
 }
 
-void Scene2450::Exit1::changeScene() {
+void Scene2450::SouthWestExit::changeScene() {
 	Scene2450 *scene = (Scene2450 *)R2_GLOBALS._sceneManager._scene;
 
 	if ((R2_GLOBALS._player._characterIndex == R2_SEEKER) || (R2_GLOBALS.getFlag(61))) {
@@ -1992,8 +1992,8 @@ void Scene2450::postInit(SceneObjectList *OwnerList) {
 	_stripManager.addSpeaker(&_caretakerSpeaker);
 
 	if (R2_GLOBALS.getFlag(72)) {
-		_exit1.setDetails(Rect(0, 143, 47, 168), EXITCURSOR_SW, 2000);
-		_exit1.setDest(Common::Point(10, 160));
+		_southWestExit.setDetails(Rect(0, 143, 47, 168), EXITCURSOR_SW, 2000);
+		_southWestExit.setDest(Common::Point(10, 160));
 	}
 
 	if (!R2_GLOBALS.getFlag(61)) {
@@ -2070,7 +2070,7 @@ void Scene2450::postInit(SceneObjectList *OwnerList) {
 				_careTaker.setPosition(Common::Point(34, 153));
 				_careTaker.setDetails(2001, 40, -1, -1, 1, (SceneItem *)NULL);
 
-				_exit1._enabled = false;
+				_southWestExit._enabled = false;
 			}
 		} else {
 			R2_GLOBALS._player.postInit();
@@ -2103,7 +2103,7 @@ void Scene2450::postInit(SceneObjectList *OwnerList) {
 				_careTaker.setPosition(Common::Point(34, 153));
 				_careTaker.setDetails(2001, 40, -1, -1, 1, (SceneItem *)NULL);
 
-				_exit1._enabled = false;
+				_southWestExit._enabled = false;
 			}
 		}
 		R2_GLOBALS._player.enableControl();
@@ -2182,7 +2182,7 @@ void Scene2450::signal() {
 		_stripManager.start(700, this);
 		break;
 	case 2454:
-		_exit1._enabled = true;
+		_southWestExit._enabled = true;
 		R2_GLOBALS.setFlag(72);
 		_careTaker.remove();
 		if (R2_GLOBALS.getFlag(61)) {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index 78af20c..93230fa 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -309,7 +309,7 @@ class Scene2450 : public SceneExt {
 		bool startAction(CursorType action, Event &event);
 	};
 
-	class Exit1 : public SceneExit {
+	class SouthWestExit : public SceneExit {
 	public:
 		virtual void changeScene();
 	};
@@ -323,7 +323,7 @@ public:
 	SceneActor _companion;
 	Parker _parker;
 	CareTaker _careTaker;
-	Exit1 _exit1;
+	SouthWestExit _southWestExit;
 	SequenceManager _sequenceManager;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);






More information about the Scummvm-git-logs mailing list