[Scummvm-cvs-logs] SF.net SVN: scummvm:[42996] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 42996
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42996&view=rev
Author:   drmccoy
Date:     2009-08-02 10:40:48 +0000 (Sun, 02 Aug 2009)

Log Message:
-----------
Removing _frameWaitLag. It broke normal animation speed in pre-v4 games and didn't even do what it was supposed to in v4+ games anyway. (bug #2830985)

Modified Paths:
--------------
    scummvm/trunk/engines/gob/util.cpp
    scummvm/trunk/engines/gob/util.h

Modified: scummvm/trunk/engines/gob/util.cpp
===================================================================
--- scummvm/trunk/engines/gob/util.cpp	2009-08-02 10:40:27 UTC (rev 42995)
+++ scummvm/trunk/engines/gob/util.cpp	2009-08-02 10:40:48 UTC (rev 42996)
@@ -45,7 +45,6 @@
 	_frameRate      = 12;
 	_frameWaitTime  = 0;
 	_startFrameTime = 0;
-	_frameWaitLag   = 0;
 }
 
 uint32 Util::getTimeKey(void) {
@@ -331,12 +330,10 @@
 	_frameRate = rate;
 	_frameWaitTime = 1000 / rate;
 	_startFrameTime = getTimeKey();
-	_frameWaitLag = 0;
 }
 
 void Util::notifyNewAnim() {
 	_startFrameTime = getTimeKey();
-	_frameWaitLag = 0;
 }
 
 void Util::waitEndFrame() {
@@ -350,17 +347,12 @@
 		return;
 	}
 
-	int32 waitTime = _frameWaitTime - _frameWaitLag;
-	int32 toWait = waitTime - time;
+	int32 toWait = _frameWaitTime - time;
 
 	if (toWait > 0)
 		delay(toWait);
 
-	int32 now = getTimeKey();
-
-	_frameWaitLag = (now - _startFrameTime) - waitTime;
-
-	_startFrameTime = now;
+	_startFrameTime = getTimeKey();
 }
 
 void Util::setScrollOffset(int16 x, int16 y) {

Modified: scummvm/trunk/engines/gob/util.h
===================================================================
--- scummvm/trunk/engines/gob/util.h	2009-08-02 10:40:27 UTC (rev 42995)
+++ scummvm/trunk/engines/gob/util.h	2009-08-02 10:40:48 UTC (rev 42996)
@@ -145,7 +145,6 @@
 	int16 _frameRate;
 	int16 _frameWaitTime;
 	uint32 _startFrameTime;
-	int32 _frameWaitLag;
 
 	GobEngine *_vm;
 


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