diff options
author | Paul Gilbert | 2013-11-02 18:18:38 -0400 |
---|---|---|
committer | Paul Gilbert | 2013-11-02 18:18:38 -0400 |
commit | 51d766208c7d2111eee86c2f2bc7f3b8a9424fc9 (patch) | |
tree | f2e5d575ec2a4da5cd041facd887f9830564dd31 /engines | |
parent | 53e75d2217f51a00277e8cc59aa9086bc1f6aa3e (diff) | |
download | scummvm-rg350-51d766208c7d2111eee86c2f2bc7f3b8a9424fc9.tar.gz scummvm-rg350-51d766208c7d2111eee86c2f2bc7f3b8a9424fc9.tar.bz2 scummvm-rg350-51d766208c7d2111eee86c2f2bc7f3b8a9424fc9.zip |
TSAGE: Renamings for Ralf/Tomko cutscene
Diffstat (limited to 'engines')
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes3.cpp | 7 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes3.h | 4 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_speakers.cpp | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index 284bce55c9..2da2ce3a81 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -1093,8 +1093,8 @@ void Scene3245::postInit(SceneObjectList *OwnerList) { R2_GLOBALS._player.hide(); R2_GLOBALS._player.disableControl(); - _actor1.postInit(); - _actor2.postInit(); + _ralf.postInit(); + _tomko.postInit(); if (R2_GLOBALS._scientistConvIndex < 4) ++R2_GLOBALS._scientistConvIndex; @@ -1103,7 +1103,8 @@ void Scene3245::postInit(SceneObjectList *OwnerList) { SceneItem::display(1200, 7, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999); signal(); } else { - setAction(&_sequenceManager, this, 3244 + R2_GLOBALS._scientistConvIndex, &_actor1, &_actor2, NULL); + setAction(&_sequenceManager, this, 3244 + R2_GLOBALS._scientistConvIndex, + &_ralf, &_tomko, NULL); } } diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h index 7272c47793..b0557cf6f4 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.h +++ b/engines/tsage/ringworld2/ringworld2_scenes3.h @@ -248,8 +248,8 @@ class Scene3245 : public SceneExt { public: SpeakerRalf3245 _ralfSpeaker; SpeakerTomko3245 _tomkoSpeaker; - SceneActor _actor1; - SceneActor _actor2; + SceneActor _ralf; + SceneActor _tomko; SequenceManager _sequenceManager; virtual void postInit(SceneObjectList *OwnerList = NULL); diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp index e60d936d5c..c90e85e541 100644 --- a/engines/tsage/ringworld2/ringworld2_speakers.cpp +++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp @@ -1877,7 +1877,7 @@ void SpeakerRalf3245::proc15() { Scene3245 *scene = (Scene3245 *)R2_GLOBALS._sceneManager._scene; if (!_object2) { - _object2 = &scene->_actor1; + _object2 = &scene->_ralf; _object2->hide(); _object1.postInit(); _object1.setPosition(_object2->_position); @@ -2895,7 +2895,7 @@ void SpeakerTomko3245::proc15() { Scene3245 *scene = (Scene3245 *)R2_GLOBALS._sceneManager._scene; if (!_object2) { - _object2 = &scene->_actor2; + _object2 = &scene->_tomko; _object2->hide(); _object1.postInit(); _object1.setPosition(_object2->_position); |