[Paintown-list] SF.net SVN: paintown:[8054] trunk/src

[<ka...@us...>]

Revision: 8054
          http://sourceforge.net/p/paintown/code/8054
Author:   kazzmir
Date:     2013-11-03 22:59:51 +0000 (Sun, 03 Nov 2013)
Log Message:
-----------
[mugen] set player behavior for roundover depending on what the ticker is

Modified Paths:
--------------
    trunk/src/mugen/characterhud.cpp
    trunk/src/test/mugen/replay.cpp

Modified: trunk/src/mugen/characterhud.cpp
===================================================================
--- trunk/src/mugen/characterhud.cpp	2013-11-03 08:00:25 UTC (rev 8053)
+++ trunk/src/mugen/characterhud.cpp	2013-11-03 22:59:51 UTC (rev 8054)
@@ -1263,6 +1263,9 @@
                 // Remove player control
                 player1.setBehavior(&dummyBehavior);
                 player2.setBehavior(&dummyBehavior);
+            } else {
+                player1.setBehavior(player1Behavior);
+                player2.setBehavior(player2Behavior);
             }
 
             break;

Modified: trunk/src/test/mugen/replay.cpp
===================================================================
--- trunk/src/test/mugen/replay.cpp	2013-11-03 08:00:25 UTC (rev 8053)
+++ trunk/src/test/mugen/replay.cpp	2013-11-03 22:59:51 UTC (rev 8054)
@@ -525,7 +525,7 @@
 
 static void writeToFile(string filename, string data){
     ofstream out(filename.c_str());
-    out << data;
+    out << data << std::endl;
     out.close();
 }
 
@@ -600,11 +600,10 @@
 
             /* Go back 100 ticks and rerun the simulation */
             if (logicCycle == count){
-                int before = count - 100;
-                Global::debug(0) << "Rewinding by 100 ticks to " << before << std::endl;
-                stage->updateState(*worlds[before]);
+                logicCycle -= 100;
+                Global::debug(0) << "Rewinding by 100 ticks to " << logicCycle << std::endl;
+                stage->updateState(*worlds[logicCycle]);
                 count += 100;
-                logicCycle -= 100;
             }
         }
     }