[Scummvm-cvs-logs] SF.net SVN: scummvm:[48132] scummvm/trunk/engines/teenagent/callbacks.cpp

megath at users.sourceforge.net megath at users.sourceforge.net
Fri Feb 26 08:37:36 CET 2010


Revision: 48132
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48132&view=rev
Author:   megath
Date:     2010-02-26 07:37:35 +0000 (Fri, 26 Feb 2010)

Log Message:
-----------
better flag/scene checking for the last intrusion attempt

Modified Paths:
--------------
    scummvm/trunk/engines/teenagent/callbacks.cpp

Modified: scummvm/trunk/engines/teenagent/callbacks.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/callbacks.cpp	2010-02-26 07:36:52 UTC (rev 48131)
+++ scummvm/trunk/engines/teenagent/callbacks.cpp	2010-02-26 07:37:35 UTC (rev 48132)
@@ -4050,7 +4050,7 @@
 		displayCutsceneMessage(0x580a, 30484);
 		processCallback(ptr);
 		playMusic(6);
-		if (res->dseg.get_byte(0xdbec) != 1)
+		if (getFlag(0xdbec) != 1 || ptr != 0x9f3e) //ptr check eq. scene_id == 11
 			loadScene(id, scene->getPosition());
 		return true;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list