[Scummvm-cvs-logs] scummvm master -> 88485f2b1fa783fb72258d4b8558e35d6bee4c6a

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
88485f2b1f TSAGE: Renamings for R2R guard cutscene


Commit: 88485f2b1fa783fb72258d4b8558e35d6bee4c6a
    https://github.com/scummvm/scummvm/commit/88485f2b1fa783fb72258d4b8558e35d6bee4c6a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-02T14:50:50-07:00

Commit Message:
TSAGE: Renamings for R2R guard cutscene

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes3.cpp
    engines/tsage/ringworld2/ringworld2_scenes3.h
    engines/tsage/ringworld2/ringworld2_speakers.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 191e890..725d8da 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -950,11 +950,12 @@ void Scene3200::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player.hide();
 	R2_GLOBALS._player.disableControl();
 
-	_actor1.postInit();
-	_actor3.postInit();
-	_actor2.postInit();
+	_rocko.postInit();
+	_jocko.postInit();
+	_socko.postInit();
 
-	setAction(&_sequenceManager, this, 3200 + R2_GLOBALS._randomSource.getRandomNumber(1), &_actor1, &_actor2, &_actor3, NULL);
+	setAction(&_sequenceManager, this, 3200 + R2_GLOBALS._randomSource.getRandomNumber(1),
+		&_rocko, &_jocko, &_socko, NULL);
 }
 
 void Scene3200::signal() {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 969c49a..af5466e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -185,9 +185,9 @@ public:
 	SpeakerRocko3200 _rockoSpeaker;
 	SpeakerJocko3200 _jockoSpeaker;
 	SpeakerSocko3200 _sockoSpeaker;
-	SceneActor _actor1;
-	SceneActor _actor2;
-	SceneActor _actor3;
+	SceneActor _rocko;
+	SceneActor _jocko;
+	SceneActor _socko;
 	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 fee97f2..1fa9838 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -475,7 +475,7 @@ void SpeakerJocko3200::proc15() {
 	Scene3200 *scene = (Scene3200 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor2;
+		_object2 = &scene->_jocko;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
@@ -1929,7 +1929,7 @@ void SpeakerRocko3200::proc15() {
 	Scene3200 *scene = (Scene3200 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor1;
+		_object2 = &scene->_rocko;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
@@ -2577,7 +2577,7 @@ void SpeakerSocko3200::proc15() {
 	Scene3200 *scene = (Scene3200 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor3;
+		_object2 = &scene->_socko;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);