[Scummvm-cvs-logs] scummvm master -> 067ffbcb466145534662a223ecc1729001980872
dreammaster
dreammaster at scummvm.org
Sun Nov 3 14:06:20 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:
067ffbcb46 TSAGE: Renamings for R2R Teleporting Outside scene
Commit: 067ffbcb466145534662a223ecc1729001980872
https://github.com/scummvm/scummvm/commit/067ffbcb466145534662a223ecc1729001980872
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-03T05:05:49-08:00
Commit Message:
TSAGE: Renamings for R2R Teleporting Outside scene
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 5adbd2c..cfa77ef 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -4970,14 +4970,14 @@ void Scene3700::postInit(SceneObjectList *OwnerList) {
_webbster._moveDiff = Common::Point(5, 3);
_webbster.hide();
- _actor5.postInit();
+ _teleportPad.postInit();
R2_GLOBALS._player.disableControl();
R2_GLOBALS._sound1.play(332);
_sceneMode = 3700;
setAction(&_sequenceManager, this, 3700, &_quinn, &_seeker, &_miranda,
- &_webbster, &_actor5, NULL);
+ &_webbster, &_teleportPad, NULL);
}
void Scene3700::remove() {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 7345061..8067215 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -754,7 +754,7 @@ public:
SceneActor _seeker;
SceneActor _miranda;
SceneActor _webbster;
- SceneActor _actor5;
+ SceneActor _teleportPad;
SequenceManager _sequenceManager;
virtual void postInit(SceneObjectList *OwnerList = NULL);
More information about the Scummvm-git-logs
mailing list