[Scummvm-cvs-logs] scummvm master -> 9999a0e2101292f907d1b5c0cabcee4b05635bee

[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:
08e3adcf28 TSAGE: Fix for visual speakers animation in R2R
9999a0e210 TSAGE: Fix for crash when saving in R2R scene 300


Commit: 08e3adcf28444b9709abfdab562ebc16bf19b11c
    https://github.com/scummvm/scummvm/commit/08e3adcf28444b9709abfdab562ebc16bf19b11c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-07-07T11:35:08-07:00

Commit Message:
TSAGE: Fix for visual speakers animation in R2R

Changed paths:
    engines/tsage/converse.cpp



diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index de5ac62..ef00273 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -843,8 +843,12 @@ void StripManager::signal() {
 			}
 		}
 
-		if ((g_vm->getGameID() == GType_Ringworld2) && (_obj44List.size() > 0))
-			static_cast<Ringworld2::VisualSpeaker *>(_activeSpeaker)->proc15();
+		if (g_vm->getGameID() == GType_Ringworld2) {
+			Ringworld2::VisualSpeaker *speaker = static_cast<Ringworld2::VisualSpeaker *>(_activeSpeaker);
+			speaker->_fieldF6 = obj44._field8;
+			if (_obj44List.size() > 0)
+				speaker->proc15();
+		}
 
 		_textShown = true;
 		_activeSpeaker->setText(choiceList[strIndex]);


Commit: 9999a0e2101292f907d1b5c0cabcee4b05635bee
    https://github.com/scummvm/scummvm/commit/9999a0e2101292f907d1b5c0cabcee4b05635bee
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-07-07T18:43:26-07:00

Commit Message:
TSAGE: Fix for crash when saving in R2R scene 300

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes0.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 0c0376f..2c944f2 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -3236,7 +3236,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 	_protocolDisplay.postInit();
 	_protocolDisplay.setup(300, 6, 1);
 	_protocolDisplay.setPosition(Common::Point(287, 71));
-	_protocolDisplay.animate(ANIM_MODE_7, NULL);
+	_protocolDisplay.animate(ANIM_MODE_7, 0, NULL);
 	_protocolDisplay._numFrames = 5;
 
 	_object6.postInit();