[Scummvm-cvs-logs] scummvm master -> 4f360a703a70b697cad8de58485858555ed8faa8

[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:
9966f19523 TSAGE: Workaround to allow debugging animation scenes easier
4f360a703a TSAGE: Minor comments and constant fix for text display in R2R scene 300


Commit: 9966f195233539dafdf6d01bf70847ddab3b903b
    https://github.com/scummvm/scummvm/commit/9966f195233539dafdf6d01bf70847ddab3b903b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-08-11T13:13:53-07:00

Commit Message:
TSAGE: Workaround to allow debugging animation scenes easier

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



diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index cb28d6d..f1f9f9f 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -323,6 +323,12 @@ SceneExt::SceneExt(): Scene() {
 	_savedUiEnabled = false;
 	_savedCanWalk = false;
 	_focusObject = NULL;
+
+	// WORKAROUND: In the original, playing animations don't reset the global _animationCtr
+	// counter as scene changes unless the playing animation explicitly finishes. For now,
+	// to make inter-scene debugging easier, I'm explicitly resetting the _animationCtr
+	// on scene start, since scene objects aren't drawn while it's non-zero
+	R2_GLOBALS._animationCtr = 0;
 }
 
 void SceneExt::postInit(SceneObjectList *OwnerList) {


Commit: 4f360a703a70b697cad8de58485858555ed8faa8
    https://github.com/scummvm/scummvm/commit/4f360a703a70b697cad8de58485858555ed8faa8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-08-11T13:14:19-07:00

Commit Message:
TSAGE: Minor comments and constant fix for text display in R2R scene 300

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index ead4f5c..da7948f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -3394,9 +3394,11 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 			R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 
 			if (R2_GLOBALS.getFlag(51)) {
+				// Things don't seem right
 				_sceneMode = 13;
 				_stripManager.start3(300, this, R2_GLOBALS._stripManager_lookupList);
 			} else {
+				// Back in Ringworld space
 				_sceneMode = 11;
 				_stripManager.start3(200, this, R2_GLOBALS._stripManager_lookupList);
 			}
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index b8d593b..cd2ff66 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -76,7 +76,7 @@ void VisualSpeaker::signal() {
 
 		if ((R2_GLOBALS._speechSubtitles & SPEECH_VOICE) && _soundId) {
 			// TODO: Check global that is passed
-			setFrame2(/* word_55F90 */ 0);
+			setFrame2(/* word_55F90 */ 1);
 		}
 	} else if (_action && _object2) {
 		_action->setDelay(1);