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

megath at users.sourceforge.net megath at users.sourceforge.net
Thu Feb 25 20:54:28 CET 2010


Revision: 48125
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48125&view=rev
Author:   megath
Date:     2010-02-25 19:54:28 +0000 (Thu, 25 Feb 2010)

Log Message:
-----------
fixed delayed callback timing

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

Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp	2010-02-25 15:22:26 UTC (rev 48124)
+++ scummvm/trunk/engines/teenagent/scene.cpp	2010-02-25 19:54:28 UTC (rev 48125)
@@ -815,12 +815,13 @@
 			}
 		}
 
-		if (!busy && !restart && callback_timer) {
+		if (!busy && !restart && tick_game && callback_timer) {
 			if (--callback_timer == 0) {
 				if (_engine->inventory->active())
 					_engine->inventory->activate(false);
 				_engine->processCallback(callback);
 			}
+			//debug(0, "callback timer = %u", callback_timer);
 		}
 
 		//if (!current_event.empty())


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