Ticket #4990: load_simstate+visual_replay.diff

source/ps/Game.cpp

@@ -37 +37 @@
 #include "ps/LoaderThunks.h"
 #include "ps/Profile.h"
 #include "ps/Replay.h"
 #include "ps/Shapes.h"
 #include "ps/World.h"
+#include "ps/GameSetup/CmdLineArgs.h"
 #include "ps/GameSetup/GameSetup.h"
 #include "renderer/Renderer.h"
 #include "renderer/TimeManager.h"
 #include "renderer/WaterManager.h"
 #include "scriptinterface/ScriptInterface.h"
@@ -52 +53 @@
 #include "tools/atlas/GameInterface/GameLoop.h"
 
 extern bool g_GameRestarted;
 extern GameLoopState* g_AtlasGameLoop;
 
+extern CmdLineArgs g_args;
+
 /**
  * Globally accessible pointer to the CGame object.
  **/
 CGame *g_Game=NULL;
 
@@ -189 +192 @@
     JSContext* cx = scriptInterface.GetContext();
     JSAutoRequest rq(cx);
 
     JS::RootedValue attribs(cx);
     scriptInterface.ParseJSON(line, &attribs);
-    StartGame(&attribs, "");
+
+    CStr savegame = "";
+    if (g_args.Has("load"))
+    {
+        std::ifstream file (g_args.Get("load").c_str(), std::ifstream::in);
+        std::stringstream buffer;
+        buffer << file.rdbuf();
+        savegame = buffer.str();
+    }
+
+    StartGame(&attribs, savegame);
 
     return true;
 }
 
 /**