[PlaneShift-svn] SF.net SVN: planeshift:[6149] trunk/src/client/psengine.cpp

[<rly...@us...>]

Revision: 6149
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6149&view=rev
Author:   rlydontknow
Date:     2010-08-10 00:12:32 +0000 (Tue, 10 Aug 2010)

Log Message:
-----------
fixed frame limit

Modified Paths:
--------------
    trunk/src/client/psengine.cpp

Modified: trunk/src/client/psengine.cpp
===================================================================
--- trunk/src/client/psengine.cpp	2010-08-08 17:01:42 UTC (rev 6148)
+++ trunk/src/client/psengine.cpp	2010-08-10 00:12:32 UTC (rev 6149)
@@ -1028,20 +1028,10 @@
     // If we're loading then do special handling.
     if(zonehandler.IsValid() && zonehandler->IsLoading())
     {
-        // Do 30 frame updates a second at most.
-        if(elapsedTime < 33)
-        {
-            // If we're not due to update then sleep.
-            csSleep(33 - elapsedTime);
-        }
-
-        // Now it's time to draw another frame.
-        elapsed = csGetTicks();
-        return true;
+        sleeptime = 1000/30;
     }
-
     // Define sleeptimes
-    if(!camera)
+    else if(!camera)
     {
         // Get the window
         static pawsWidget* credits = NULL;
@@ -1049,14 +1039,16 @@
             credits = paws->FindWidget("CreditsWindow", false);
 
         if(credits && credits->IsVisible())
-            sleeptime = 10;
+            sleeptime = 1000/60;
         else
-            sleeptime = 30;
+            sleeptime = 1000/30;
     }
     else
+    {
         sleeptime = frameLimit;
+    }
 
-    timeFPS += elapsedTime;
+    timeFPS += sleeptime;
     countFPS++;
     if(timeFPS > 500)
     {
@@ -1064,11 +1056,11 @@
 	timeFPS = 0;
 	countFPS = 0;
     }
-    elapsed = csGetTicks();
 
     // Here we sacrifice drawing AND loading time
     if(elapsedTime < sleeptime)
         csSleep(sleeptime - elapsedTime);
+    elapsed = csGetTicks();
 
     return true;
 }


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