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

[dreammaster]

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

Summary:
5c9d752e1d TSAGE: Fix to set _endAction when playing voice samples
e385999700 TSAGE: Renamings for R2R desert scene


Commit: 5c9d752e1d3f8e433e37d51377368fa975df567f
    https://github.com/scummvm/scummvm/commit/5c9d752e1d3f8e433e37d51377368fa975df567f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-03T05:28:13-08:00

Commit Message:
TSAGE: Fix to set _endAction when playing voice samples

Changed paths:
    engines/tsage/sound.cpp



diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 1014a07..c7ac14a 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -2621,6 +2621,7 @@ bool PlayStream::play(int voiceNum, EventHandler *endAction) {
 		g_vm->_mixer->playStream(Audio::Mixer::kSpeechSoundType, &_soundHandle, 
 			_audioStream, DisposeAfterUse::YES);
 		_voiceNum = voiceNum;
+		_endAction = endAction;
 		return true;
 	}
 	 


Commit: e38599970080d73792bdfe188d8db49cfb75ceae
    https://github.com/scummvm/scummvm/commit/e38599970080d73792bdfe188d8db49cfb75ceae
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-03T05:28:28-08:00

Commit Message:
TSAGE: Renamings for R2R desert scene

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index cfa77ef..be09999 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -5203,20 +5203,21 @@ void Scene3800::enterArea() {
 		R2_GLOBALS._player.setStrip(3);
 		R2_GLOBALS._player.changeZoom(-1);
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
-		_actor1.postInit();
-		_actor1.fixPriority(10);
-		_actor1.changeZoom(-1);
-		_actor1.setVisage(1110);
-		_actor1._effect = 5;
-		_actor1._field9C = this->_field312;
-		R2_GLOBALS._player._linkedActor = &_actor1;
+		_balloonQuinn.postInit();
+		_balloonQuinn.fixPriority(10);
+		_balloonQuinn.changeZoom(-1);
+		_balloonQuinn.setVisage(1110);
+		_balloonQuinn._effect = 5;
+		_balloonQuinn._field9C = this->_field312;
+		R2_GLOBALS._player._linkedActor = &_balloonQuinn;
 		switch (R2_GLOBALS._sceneManager._previousScene) {
 		case 2600:
-			_object1.postInit();
-			_object2.postInit();
-			_actor1.hide();
+			_balloon.postInit();
+			_harness.postInit();
+			_balloonQuinn.hide();
 			_sceneMode = 3800;
-			setAction(&_sequenceManager1, this, 3800, &R2_GLOBALS._player, &_object1, &_object2, NULL);
+			setAction(&_sequenceManager1, this, 3800, &R2_GLOBALS._player, 
+				&_balloon, &_harness, NULL);
 			break;
 		case 3900:
 			_sceneMode = 15;
@@ -5359,9 +5360,9 @@ void Scene3800::signal() {
 		g_globals->_sceneManager.changeScene(3900);
 		break;
 	case 3800:
-		_actor1.show();
-		_object1.remove();
-		_object2.remove();
+		_balloonQuinn.show();
+		_balloon.remove();
+		_harness.remove();
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 3805:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 8067215..40c3517 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -784,9 +784,9 @@ class Scene3800 : public SceneExt {
 	};
 
 public:
-	SceneObject _object1;
-	SceneObject _object2;
-	SceneActor _actor1;
+	SceneObject _balloon;
+	SceneObject _harness;
+	SceneActor _balloonQuinn;
 	NamedHotspot _background;
 	NorthExit _northExit;
 	EastExit _eastExit;