[Scummvm-cvs-logs] SF.net SVN: scummvm:[50126] scummvm/trunk/engines/agi

[fingolfin at users.sourceforge.net]

Revision: 50126
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50126&view=rev
Author:   fingolfin
Date:     2010-06-21 21:33:45 +0000 (Mon, 21 Jun 2010)

Log Message:
-----------
AGI: Change a static var to member var AgiEngine::_lastTickTimer

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.cpp
    scummvm/trunk/engines/agi/agi.h

Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp	2010-06-21 21:33:22 UTC (rev 50125)
+++ scummvm/trunk/engines/agi/agi.cpp	2010-06-21 21:33:45 UTC (rev 50126)
@@ -272,20 +272,19 @@
 }
 
 void AgiEngine::pollTimer() {
-	static uint32 m = 0;
 	uint32 dm;
 
-	if (_tickTimer < m)
-		m = 0;
+	if (_tickTimer < _lastTickTimer)
+		_lastTickTimer = 0;
 
-	while ((dm = _tickTimer - m) < 5) {
+	while ((dm = _tickTimer - _lastTickTimer) < 5) {
 		processEvents();
 		if (_console->isAttached())
 			_console->onFrame();
 		_system->delayMillis(10);
 		_system->updateScreen();
 	}
-	m = _tickTimer;
+	_lastTickTimer = _tickTimer;
 }
 
 void AgiEngine::agiTimerFunctionLow(void *refCon) {
@@ -543,6 +542,7 @@
 	_allowSynthetic = false;
 
 	_tickTimer = 0;
+	_lastTickTimer = 0;
 
 	_intobj = NULL;
 

Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h	2010-06-21 21:33:22 UTC (rev 50125)
+++ scummvm/trunk/engines/agi/agi.h	2010-06-21 21:33:45 UTC (rev 50126)
@@ -816,6 +816,7 @@
 private:
 
 	uint32 _tickTimer;
+	uint32 _lastTickTimer;
 
 	int _keyQueue[KEY_QUEUE_SIZE];
 	int _keyQueueStart;


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