rewind/setmr bug fix

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6543 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2011-06-24 13:25:19 +00:00
parent 2f3be59098
commit 6d7da51f4c
1 changed files with 5 additions and 5 deletions
@@ -1231,11 +1231,6 @@ int main(int argc, char **argv)
        if(millis<totalmillis) millis = totalmillis;
        limitfps(millis, totalmillis);
        int elapsed = millis-totalmillis;
-        if(nextmillis && watchingdemo)
-        {
-            elapsed += nextmillis;
-            nextmillis = 0;
-        }
        if(multiplayer(false)) curtime = elapsed;
        else
        {
@@ -1243,6 +1238,11 @@ int main(int argc, char **argv)
            int scaledtime = elapsed*gamespeed + timeerr;
            curtime = scaledtime/100;
            timeerr = scaledtime%100;
+            if(nextmillis && watchingdemo)
+            {
+                curtime += nextmillis;
+                nextmillis = 0;
+            }
            if(paused) curtime = 0;
        }
        lastmillis += curtime;