[Scummvm-cvs-logs] scummvm master -> dd8271b32f64f4031caa39fd2e981c1f2912555e

dreammaster dreammaster at scummvm.org
Sat Nov 2 22:56:42 CET 2013


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:
dd8271b32f TSAGE: Renamings for R2R captain/private cutscene


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

Commit Message:
TSAGE: Renamings for R2R captain/private 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 725d8da..e2bbf05 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 af5466e..acd81de 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 1fa9838..0c901fe 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);






More information about the Scummvm-git-logs mailing list