[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.145,1.146

Robert Göffringmann lavosspawn at users.sourceforge.net
Wed Oct 20 22:27:31 CEST 2004


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21146/sky

Modified Files:
	logic.cpp 
Log Message:
fixes bug #786482, stupid gardener getting stuck in his hacky animation script.

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- logic.cpp	14 Sep 2004 20:46:04 -0000	1.145
+++ logic.cpp	21 Oct 2004 05:18:06 -0000	1.146
@@ -1372,6 +1372,21 @@
 	debug(5, "Call: fnDrawScreen(%X, %X)",a,b);
 	SkyEngine::_systemVars.currentPalette = a;
 	_skyScreen->fnDrawScreen(a, b);
+	
+	if (Logic::_scriptVariables[SCREEN] == 32) {
+		/* workaround for script bug #786482
+		    Under certain circumstances, which never got completely cleared,
+		    the gardener can get stuck in an animation, waiting for a sync
+		    signal from foster.
+			This is most probably caused by foster leaving the screen before
+			sending the sync.
+			To work around that, we simply send a sync to the gardener every time
+			we enter the screen. If he isn't stuck (and thus not waiting for sync)
+			it will be ignored anyways */
+
+		debug(1, "sending gardener sync");
+		fnSendSync(ID_SC32_GARDENER, 1, 0);
+	}
 	return true;
 }
 





More information about the Scummvm-git-logs mailing list