[Scummvm-cvs-logs] scummvm master -> 7bdd047f6a71be642f52dcb0dd99ed905d7ee5bb

dreammaster dreammaster at scummvm.org
Sat Nov 2 23:25:10 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:
7bdd047f6a TSAGE: Renamings for R2R statis negator room


Commit: 7bdd047f6a71be642f52dcb0dd99ed905d7ee5bb
    https://github.com/scummvm/scummvm/commit/7bdd047f6a71be642f52dcb0dd99ed905d7ee5bb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-02T15:24:40-07:00

Commit Message:
TSAGE: Renamings for R2R statis negator room

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 2da2ce3..ec7457a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1210,9 +1210,9 @@ void Scene3250::postInit(SceneObjectList *OwnerList) {
 	switch (R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA]) {
 	case 1200:
 		_sceneMode = 3250;
-		_actor4.postInit();
+		_grate.postInit();
 		R2_GLOBALS._player._effect = 0;
-		setAction(&_sequenceManager, this, 3250, &R2_GLOBALS._player, &_actor4, NULL);
+		setAction(&_sequenceManager, this, 3250, &R2_GLOBALS._player, &_grate, NULL);
 		break;
 	case 3125:
 		if (R2_GLOBALS.getFlag(79)) {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index b0557cf..02f9e3a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -273,7 +273,7 @@ public:
 	Door _leftDoor;
 	Door _topDoor;
 	Door _rightDoor;
-	Door _actor4;
+	Door _grate;
 	SceneActor _ghoul1;
 	SceneActor _ghoul2;
 	SceneActor _ghoul3;






More information about the Scummvm-git-logs mailing list