[Scummvm-cvs-logs] CVS: residual engine.cpp,1.29,1.30

[Oliver Kiehl]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16475

Modified Files:
	engine.cpp 
Log Message:
minor accuracy fix


Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- engine.cpp	15 Apr 2004 20:20:04 -0000	1.29
+++ engine.cpp	15 Apr 2004 20:39:09 -0000	1.30
@@ -155,14 +155,8 @@
 				(*i)->draw();
 			}
 
-			if (SHOWFPS_GLOBAL) {
-				if (timeAccum > 1000) {
-					sprintf(fps, "%7.2f", (double)(frameCounter * 1000) / (double)timeAccum );
-					frameCounter = 0;
-					timeAccum = 0;
-				}
+			if (SHOWFPS_GLOBAL)
 				g_driver->drawEmergString(550, 25, fps, Color(255, 255, 255));
-			}
 
 			currScene_->drawBitmaps(ObjectState::OBJSTATE_OVERLAY);
 			
@@ -177,11 +171,6 @@
 		frameTime_ = newStart - frameStart_;
 		frameStart_ = newStart;
 
-		if (SHOWFPS_GLOBAL) {
-			frameCounter++;
-			timeAccum += frameTime_;
-		}
-
 		lua_beginblock();
 		set_frameTime(frameTime_);
 		lua_endblock();
@@ -189,6 +178,16 @@
 		lua_beginblock();
 		set_movieTime(movieTime_);
 		lua_endblock();
+
+		if (SHOWFPS_GLOBAL) {
+			frameCounter++;
+			timeAccum += frameTime_;
+			if (timeAccum > 1000) {
+				sprintf(fps, "%7.2f", (double)(frameCounter * 1000) / (double)timeAccum );
+				frameCounter = 0;
+				timeAccum = 0;
+			}
+		}
 	}
 }