diff options
| author | Paul Gilbert | 2013-11-02 18:15:44 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-11-02 18:15:44 -0400 |
| commit | 53e75d2217f51a00277e8cc59aa9086bc1f6aa3e (patch) | |
| tree | 35e561dcb9156a63ddf4f1f33e9c177d4b419820 | |
| parent | 4dfd751210acdf0d2879e68f411b2ca5842fb411 (diff) | |
| download | scummvm-rg350-53e75d2217f51a00277e8cc59aa9086bc1f6aa3e.tar.gz scummvm-rg350-53e75d2217f51a00277e8cc59aa9086bc1f6aa3e.tar.bz2 scummvm-rg350-53e75d2217f51a00277e8cc59aa9086bc1f6aa3e.zip | |
TSAGE: Renamings for Teal monologue cutscene
| -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 442e0eda39..284bce55c9 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -1065,10 +1065,11 @@ void Scene3240::postInit(SceneObjectList *OwnerList) { R2_GLOBALS._player.hide(); R2_GLOBALS._player.disableControl(); - _actor1.postInit(); - _actor2.postInit(); + _teal.postInit(); + _webbster.postInit(); - setAction(&_sequenceManager, this, 3240 + R2_GLOBALS._randomSource.getRandomNumber(1), &_actor1, &_actor2, NULL); + setAction(&_sequenceManager, this, 3240 + R2_GLOBALS._randomSource.getRandomNumber(1), + &_teal, &_webbster, NULL); } void Scene3240::signal() { diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h index 64fe3f0648..7272c47793 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.h +++ b/engines/tsage/ringworld2/ringworld2_scenes3.h @@ -236,8 +236,8 @@ public: SpeakerTeal3240 _tealSpeaker; SpeakerWebbster3240 _webbsterSpeaker; SpeakerMiranda _mirandaSpeaker; - SceneActor _actor1; - SceneActor _actor2; + SceneActor _teal; + SceneActor _webbster; 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 25069d2224..e60d936d5c 100644 --- a/engines/tsage/ringworld2/ringworld2_speakers.cpp +++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp @@ -2743,7 +2743,7 @@ void SpeakerTeal3240::proc15() { Scene3240 *scene = (Scene3240 *)R2_GLOBALS._sceneManager._scene; if (!_object2) { - _object2 = &scene->_actor1; + _object2 = &scene->_teal; _object2->hide(); _object1.postInit(); _object1.setPosition(_object2->_position); @@ -2988,7 +2988,7 @@ void SpeakerWebbster3240::proc15() { Scene3240 *scene = (Scene3240 *)R2_GLOBALS._sceneManager._scene; if (!_object2) { - _object2 = &scene->_actor2; + _object2 = &scene->_webbster; _object2->hide(); _object1.postInit(); _object1.setPosition(_object2->_position); |