diff options
| author | Paul Gilbert | 2013-11-02 17:56:08 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-11-02 17:56:08 -0400 |
| commit | dd8271b32f64f4031caa39fd2e981c1f2912555e (patch) | |
| tree | e0e1433c640bf20ab50ee897316cb7b0ac693788 | |
| parent | 88485f2b1fa783fb72258d4b8558e35d6bee4c6a (diff) | |
| download | scummvm-rg350-dd8271b32f64f4031caa39fd2e981c1f2912555e.tar.gz scummvm-rg350-dd8271b32f64f4031caa39fd2e981c1f2912555e.tar.bz2 scummvm-rg350-dd8271b32f64f4031caa39fd2e981c1f2912555e.zip | |
TSAGE: Renamings for R2R captain/private 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 725d8da0e9..e2bbf059e6 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -979,10 +979,11 @@ void Scene3210::postInit(SceneObjectList *OwnerList) { R2_GLOBALS._player.hide(); R2_GLOBALS._player.disableControl(); - _actor1.postInit(); - _actor2.postInit(); + _captain.postInit(); + _private.postInit(); - setAction(&_sequenceManager, this, 3210 + R2_GLOBALS._randomSource.getRandomNumber(1), &_actor1, &_actor2, NULL); + setAction(&_sequenceManager, this, 3210 + R2_GLOBALS._randomSource.getRandomNumber(1), + &_captain, &_private, NULL); } void Scene3210::signal() { diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h index af5466edaa..acd81ded0e 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.h +++ b/engines/tsage/ringworld2/ringworld2_scenes3.h @@ -198,8 +198,8 @@ class Scene3210 : public SceneExt { public: SpeakerCaptain3210 _captainSpeaker; SpeakerPrivate3210 _privateSpeaker; - SceneActor _actor1; - SceneActor _actor2; + SceneActor _captain; + SceneActor _private; 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 1fa98381ad..0c901fea57 100644 --- a/engines/tsage/ringworld2/ringworld2_speakers.cpp +++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp @@ -322,7 +322,7 @@ void SpeakerCaptain3210::proc15() { Scene3210 *scene = (Scene3210 *)R2_GLOBALS._sceneManager._scene; if (!_object2) { - _object2 = &scene->_actor1; + _object2 = &scene->_captain; _object2->hide(); _object1.postInit(); _object1.setPosition(_object2->_position); @@ -1095,7 +1095,7 @@ void SpeakerPrivate3210::proc15() { Scene3210 *scene = (Scene3210 *)R2_GLOBALS._sceneManager._scene; if (!_object2) { - _object2 = &scene->_actor2; + _object2 = &scene->_private; _object2->hide(); _object1.postInit(); _object1.setPosition(_object2->_position); |