[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.146,2.147

Jamieson Christian jamieson630 at users.sourceforge.net
Thu May 15 13:35:09 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv2866/scummvm/scumm

Modified Files:
	scummvm.cpp 
Log Message:
Fixed main timing loop

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.146
retrieving revision 2.147
diff -u -d -r2.146 -r2.147
--- scummvm.cpp	14 May 2003 23:28:56 -0000	2.146
+++ scummvm.cpp	15 May 2003 20:34:42 -0000	2.147
@@ -2162,7 +2162,7 @@
 
 void Scumm::mainRun() {
 	int delta = 0;
-	int diff = 0;
+	int diff = _system->get_msecs();
 
 	for(;;) {
 #ifdef __PALM_OS__
@@ -2172,11 +2172,10 @@
 		updatePalette();
 		_system->update_screen();		
 
+		diff -= _system->get_msecs();
 		waitForTimer(delta * 15 + diff);
-
 		diff = _system->get_msecs();
 		delta = scummLoop(delta);
-		diff -= _system->get_msecs();
 
 		if (delta < 1)	// Ensure we don't get into a loop
 			delta = 1;  // by not decreasing sleepers.





More information about the Scummvm-git-logs mailing list