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

[drmccoy at users.sourceforge.net]

Revision: 41508
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41508&view=rev
Author:   drmccoy
Date:     2009-06-14 12:19:42 +0000 (Sun, 14 Jun 2009)

Log Message:
-----------
Fixed an animation speed regression that got introduced when I added a lag compensation for Woodruff

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

Modified: scummvm/trunk/engines/gob/mult_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/mult_v2.cpp	2009-06-14 11:08:35 UTC (rev 41507)
+++ scummvm/trunk/engines/gob/mult_v2.cpp	2009-06-14 12:19:42 UTC (rev 41508)
@@ -395,6 +395,8 @@
 	if (multIndex > 7)
 		error("Multindex out of range");
 
+	_vm->_util->notifyNewAnim();
+
 	debugC(4, kDebugGameFlow, "Sub mult %d", multIndex);
 	_multData = _multDatas[multIndex];
 

Modified: scummvm/trunk/engines/gob/util.cpp
===================================================================
--- scummvm/trunk/engines/gob/util.cpp	2009-06-14 11:08:35 UTC (rev 41507)
+++ scummvm/trunk/engines/gob/util.cpp	2009-06-14 12:19:42 UTC (rev 41508)
@@ -331,8 +331,14 @@
 	_frameRate = rate;
 	_frameWaitTime = 1000 / rate;
 	_startFrameTime = getTimeKey();
+	_frameWaitLag = 0;
 }
 
+void Util::notifyNewAnim() {
+	_startFrameTime = getTimeKey();
+	_frameWaitLag = 0;
+}
+
 void Util::waitEndFrame() {
 	int32 time;
 

Modified: scummvm/trunk/engines/gob/util.h
===================================================================
--- scummvm/trunk/engines/gob/util.h	2009-06-14 11:08:35 UTC (rev 41507)
+++ scummvm/trunk/engines/gob/util.h	2009-06-14 12:19:42 UTC (rev 41508)
@@ -76,6 +76,7 @@
 	void clearPalette(void);
 	int16 getFrameRate();
 	void setFrameRate(int16 rate);
+	void notifyNewAnim();
 	void waitEndFrame();
 	void setScrollOffset(int16 x = -1, int16 y = -1);
 


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