diff options
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes3.cpp | 9 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes3.h | 6 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_speakers.cpp | 4 | 
3 files changed, 10 insertions, 9 deletions
| diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index 009f5083bb..442e0eda39 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -1035,11 +1035,12 @@ void Scene3230::postInit(SceneObjectList *OwnerList) {  	R2_GLOBALS._player.hide();  	R2_GLOBALS._player.disableControl(); -	_actor1.postInit(); -	_actor2.postInit(); -	_actor3.postInit(); +	_rocko.postInit(); +	_jocko.postInit(); +	_ghoul.postInit(); -	setAction(&_sequenceManager, this, 3230 + R2_GLOBALS._randomSource.getRandomNumber(1), &_actor1, &_actor2, &_actor3, NULL); +	setAction(&_sequenceManager, this, 3230 + R2_GLOBALS._randomSource.getRandomNumber(1), +		&_rocko, &_jocko, &_ghoul, NULL);  }  void Scene3230::signal() { diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h index 587e5dc51f..64fe3f0648 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.h +++ b/engines/tsage/ringworld2/ringworld2_scenes3.h @@ -222,9 +222,9 @@ class Scene3230 : public SceneExt {  public:  	SpeakerRocko3230 _rockoSpeaker;  	SpeakerJocko3230 _jockoSpeaker; -	SceneActor _actor1; -	SceneActor _actor2; -	SceneActor _actor3; +	SceneActor _rocko; +	SceneActor _jocko; +	SceneActor _ghoul;  	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 ed2510b0c0..25069d2224 100644 --- a/engines/tsage/ringworld2/ringworld2_speakers.cpp +++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp @@ -521,7 +521,7 @@ void SpeakerJocko3230::proc15() {  	Scene3230 *scene = (Scene3230 *)R2_GLOBALS._sceneManager._scene;  	if (!_object2) { -		_object2 = &scene->_actor2; +		_object2 = &scene->_jocko;  		_object2->hide();  		_object1.postInit();  		_object1.setPosition(_object2->_position); @@ -1975,7 +1975,7 @@ void SpeakerRocko3230::proc15() {  	Scene3230 *scene = (Scene3230 *)R2_GLOBALS._sceneManager._scene;  	if (!_object2) { -		_object2 = &scene->_actor1; +		_object2 = &scene->_rocko;  		_object2->hide();  		_object1.postInit();  		_object1.setPosition(_object2->_position); | 
