[Scummvm-cvs-logs] scummvm master -> 05f3e7e8ce95edceb9da2122fc11958a90f68277

[Strangerke]

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:
05f3e7e8ce TSAGE: R2R - Renaming in scene 2440


Commit: 05f3e7e8ce95edceb9da2122fc11958a90f68277
    https://github.com/scummvm/scummvm/commit/05f3e7e8ce95edceb9da2122fc11958a90f68277
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-05T16:32:29-08:00

Commit Message:
TSAGE: R2R - Renaming in scene 2440

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 53cd32b..3073253 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -1811,7 +1811,7 @@ bool Scene2440::OilLamp::startAction(CursorType action, Event &event) {
 	return SceneActor::startAction(action, event);
 }
 
-void Scene2440::Exit1::changeScene() {
+void Scene2440::SouthEastExit::changeScene() {
 	Scene2440 *scene = (Scene2440 *)R2_GLOBALS._sceneManager._scene;
 
 	_enabled = false;
@@ -1827,8 +1827,8 @@ void Scene2440::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 	R2_GLOBALS._sound1.play(200);
 	// Fix exit cursor, the original was using NW
-	_exit1.setDetails(Rect(172, 155, 250, 167), EXITCURSOR_SE, 2000);
-	_exit1.setDest(Common::Point(210, 160));
+	_southEastExit.setDetails(Rect(172, 155, 250, 167), EXITCURSOR_SE, 2000);
+	_southEastExit.setDest(Common::Point(210, 160));
 	if (R2_INVENTORY.getObjectScene(R2_ALCOHOL_LAMP_2) == 2440) {
 		_oilLamp.postInit();
 		_oilLamp.setup(2435, 1, 1);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index 44f5143..78af20c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -269,7 +269,7 @@ class Scene2440 : public SceneExt {
 		bool startAction(CursorType action, Event &event);
 	};
 
-	class Exit1 : public SceneExit {
+	class SouthEastExit : public SceneExit {
 	public:
 		virtual void changeScene();
 	};
@@ -283,7 +283,7 @@ public:
 	NamedHotspot _bottles;
 	Companion _companion;
 	OilLamp _oilLamp;
-	Exit1 _exit1;
+	SouthEastExit _southEastExit;
 	SequenceManager _sequenceManager;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);