Ticket #3440: t3440_simplify_and_empty_JS_Interface_v1.patch

source/ps/GameSetup/GameSetup.cpp

@@ -1483 +1483 @@
     g_Game->StartVisualReplay(replayFile);
 
     // TODO: Non progressive load can fail - need a decent way to handle this
     LDR_NonprogressiveLoad();
 
-    PSRETURN ret = g_Game->ReallyStartGame();
-    ENSURE(ret == PSRETURN_OK);
+    ENSURE(g_Game->ReallyStartGame() == PSRETURN_OK);
 
     ScriptInterface& scriptInterface = g_Game->GetSimulation2()->GetScriptInterface();
 
     InitPs(true, L"page_session.xml", &scriptInterface, JS::UndefinedHandleValue);
     return true;

source/ps/VisualReplay.cpp

@@ -20 +20 @@
 #include "VisualReplay.h"
 #include "graphics/GameView.h"
 #include "gui/GUIManager.h"
 #include "lib/allocators/shared_ptr.h"
 #include "lib/utf8.h"
+#include "network/NetClient.h"
+#include "network/NetServer.h"
 #include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 #include "ps/Game.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/Replay.h"
@@ -42 +44 @@
 OsPath VisualReplay::GetDirectoryName()
 {
     return OsPath(psLogDir() / L"sim_log");
 }
 
+void VisualReplay::StartVisualReplay(CStrW directory)
+{
+    ENSURE(!g_NetServer);
+    ENSURE(!g_NetClient);
+    ENSURE(!g_Game);
+
+    const OsPath replayFile = VisualReplay::GetDirectoryName() / directory / L"commands.txt";
+
+    if (!FileExists(replayFile))
+        return;
+
+    g_Game = new CGame(false, false);
+
+    // TODO: support unicode when OsString() is implemented for windows
+    g_Game->StartVisualReplay(utf8_from_wstring(replayFile.string()));
+}
+
 JS::Value VisualReplay::GetReplays(ScriptInterface& scriptInterface)
 {
     TIMER(L"GetReplays");
     JSContext* cx = scriptInterface.GetContext();
     JSAutoRequest rq(cx);

source/ps/VisualReplay.h

@@ -35 +35 @@
  * @return OsPath the absolute file path
  */
 OsPath GetDirectoryName();
 
 /**
+ * Replays the commands.txt file in the given replay visually.
+ */
+void StartVisualReplay(CStrW directory);
+
+/**
  * Get a list of replays to display in the GUI.
  *
  * @param scriptInterface the ScriptInterface in which to create the return data.
  * @return array of objects containing replay data
  */

source/ps/scripting/JSInterface_VisualReplay.cpp

@@ -15 +15 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "precompiled.h"
 
-#include "network/NetClient.h"
-#include "network/NetServer.h"
-#include "ps/Filesystem.h"
-#include "ps/Game.h"
 #include "ps/VisualReplay.h"
 #include "ps/scripting/JSInterface_VisualReplay.h"
 
 void JSI_VisualReplay::StartVisualReplay(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), CStrW directory)
 {
-    ENSURE(!g_NetServer);
-    ENSURE(!g_NetClient);
-    ENSURE(!g_Game);
-
-    const OsPath replayFile = VisualReplay::GetDirectoryName() / directory / L"commands.txt";
-    if (FileExists(replayFile))
-    {
-        g_Game = new CGame(false, false);
-        // TODO: support unicode when OsString() is implemented for windows
-        g_Game->StartVisualReplay(utf8_from_wstring(replayFile.string()));
-    }
+    VisualReplay::StartVisualReplay(directory);
 }
 
 bool JSI_VisualReplay::DeleteReplay(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), CStrW replayFile)
 {
     return VisualReplay::DeleteReplay(replayFile);