thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TSAGE: Renamings for Teal monologue cutscene

Browse source
This commit is contained in:
Paul Gilbert 2013-11-02 18:15:44 -04:00
parent 4dfd751210
commit 53e75d2217
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engines/tsage/ringworld2/ringworld2_scenes3.cpp
View file

@ -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() {

4
engines/tsage/ringworld2/ringworld2_scenes3.h
View file

@ -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);

4
engines/tsage/ringworld2/ringworld2_speakers.cpp
View file

@ -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);