[Scummvm-cvs-logs] scummvm master -> e2d893f5560a0d65362c6413754264b2a6713a40

[dreammaster]

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:
e2d893f556 TSAGE: Renamings for R2R guard post


Commit: e2d893f5560a0d65362c6413754264b2a6713a40
    https://github.com/scummvm/scummvm/commit/e2d893f5560a0d65362c6413754264b2a6713a40
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-02T15:56:21-07:00

Commit Message:
TSAGE: Renamings for R2R guard post

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index ec7457a..c78885c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1303,10 +1303,10 @@ void Scene3255::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._sound1.play(267);
 		R2_GLOBALS._sound2.play(268);
 		_sceneMode = 3257;
-		_actor3.postInit();
+		_door.postInit();
 		_quinn.postInit();
 		_quinn._effect = 1;
-		setAction(&_sequenceManager, this, 3257, &R2_GLOBALS._player, &_quinn, &_actor3, NULL);
+		setAction(&_sequenceManager, this, 3257, &R2_GLOBALS._player, &_quinn, &_door, NULL);
 	} else {
 		_teal.postInit();
 		_teal.setup(303, 1, 1);
@@ -1328,7 +1328,7 @@ void Scene3255::signal() {
 		_ghoul2.postInit();
 		_ghoul3.postInit();
 		setAction(&_sequenceManager, this, 3258, &R2_GLOBALS._player, &_quinn, 
-			&_actor3, &_ghoul1, &_ghoul2, &_ghoul3, NULL);
+			&_door, &_ghoul1, &_ghoul2, &_ghoul3, NULL);
 		break;
 	case 3256:
 		R2_GLOBALS._sceneManager.changeScene(3250);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 02f9e3a..844702d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -288,7 +288,7 @@ class Scene3255 : public SceneExt {
 public:
 	SceneActor _teal;
 	SceneActor _guard;
-	SceneActor _actor3;
+	SceneActor _door;
 	SceneActor _quinn;
 	SceneActor _ghoul1;
 	SceneActor _ghoul2;