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

[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:
c1fcd5aa28 TSAGE: Fix for bug #6734 - insetUp being incorrect


Commit: c1fcd5aa28633b65dd24ff5aae9f896351808f0c
    https://github.com/scummvm/scummvm/commit/c1fcd5aa28633b65dd24ff5aae9f896351808f0c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-09-20T10:19:06-04:00

Commit Message:
TSAGE: Fix for bug #6734 - insetUp being incorrect

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 99188c1..99913d8 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -355,6 +355,11 @@ SceneExt::SceneExt(): Scene() {
 	// 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;
+
+	// WORKAROUND: We had a case where at some point the number of modal dialogs
+	// open became incorrect. So reset it on scene changes to fix the problem if
+	// it ever happens
+	R2_GLOBALS._insetUp = 0;
 }
 
 void SceneExt::synchronize(Serializer &s) {