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

Strangerke Strangerke at scummvm.org
Sun Nov 3 22:16:33 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:
a6ca886bc5 TSAGE: R2R - Rename a variable in scene 1100


Commit: a6ca886bc5164ae7a5b2e5c41ca5158d34689e29
    https://github.com/scummvm/scummvm/commit/a6ca886bc5164ae7a5b2e5c41ca5158d34689e29
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-03T13:15:56-08:00

Commit Message:
TSAGE: R2R - Rename a variable in scene 1100

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index b379cac..cea3865 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -878,7 +878,7 @@ void Scene1100::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._player._moveDiff = Common::Point(16, 2);
 
 		_rightLandslide.setup2(1104, 2, 1, 175, 125, 102, 1);
-		_object2.setup2(1102, 5, 1, 216, 167, 1, 0);
+		_purplePlant.setup2(1102, 5, 1, 216, 167, 1, 0);
 
 		_leftImpacts.postInit();
 		_leftImpacts.setup(1113, 2, 1);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 5825320..9511297 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -117,7 +117,7 @@ public:
 	SceneActor _runningGuy2;
 	SceneActor _runningGuy3;
 	BackgroundSceneObject _rightLandslide;
-	BackgroundSceneObject _object2;
+	BackgroundSceneObject _purplePlant;
 	Seeker _seeker;
 	Trooper _trooper;
 	Chief _chief;






More information about the Scummvm-git-logs mailing list