From 6d7da51f4c83ba4fee506d3d70e840121189ff9c Mon Sep 17 00:00:00 2001
From: Lucas GAUTHERON <lucas.gautheron@gmail.com>
Date: Fri, 24 Jun 2011 13:25:19 +0000
Subject: [PATCH] rewind/setmr bug fix

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6543 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/main.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/src/main.cpp b/source/src/main.cpp
index 24519f2f..b744a09c 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -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;