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

[megath at users.sourceforge.net]

Revision: 47972
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47972&view=rev
Author:   megath
Date:     2010-02-07 17:16:30 +0000 (Sun, 07 Feb 2010)

Log Message:
-----------
added missing haystack callback, fixed fatso visibility bug

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

Modified: scummvm/trunk/engines/teenagent/callbacks.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/callbacks.cpp	2010-02-07 17:15:04 UTC (rev 47971)
+++ scummvm/trunk/engines/teenagent/callbacks.cpp	2010-02-07 17:16:30 UTC (rev 47972)
@@ -823,6 +823,7 @@
 		} else if (CHECK_FLAG(0xDBA0, 1))
 			displayMessage(0x3E31);
 		else {
+			setFlag(0xdbec, 0); //workaround visible fatso bug(valve as last intrusion attempt)
 			moveTo(173, 138, 2);
 			playSound(28, 5);
 			playActorAnimation(583);
@@ -839,6 +840,7 @@
 			playActorAnimation(586);
 			moveTo(138, 163, 3);
 			displayMessage(0x3650);
+			setFlag(0xdbec, 1);
 			SET_FLAG(0xDBA0, 1);
 			processCallback(0x9d45); //another mansion try
 		}
@@ -2296,6 +2298,12 @@
 			return false;
 		return processCallback(0x61fe);
 
+	case 0x79d2:
+		if (CHECK_FLAG(0xDB9D, 1)) //bug in original game?
+			return false;
+		displayMessage(0x3590);
+		return true;
+
 	case 0x7af0:
 		if (!processCallback(0x70e0))
 			return true;
@@ -4028,12 +4036,12 @@
 
 	case 0x9d45: {
 		wait(50);
-		byte tries = ++ *(res->dseg.ptr(0xDBEA));
-		debug(0, "another mansion try: %u", tries);
-		if (tries >= 7)
+		byte attempts = ++ *(res->dseg.ptr(0xDBEA));
+		debug(0, "mansion intrusion attempt #%u", attempts);
+		if (attempts >= 7)
 			return false;
 
-		uint16 ptr = res->dseg.get_word((tries - 2) * 2 + 0x6035);
+		uint16 ptr = res->dseg.get_word((attempts - 2) * 2 + 0x6035);
 		byte id = scene->getId();
 
 		playMusic(11);


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