Ticket #4020: 4020_altf4_v1.patch

binaries/data/mods/public/gui/session/session.js

@@ -511 +511 @@
         resumeGame(true);
 }
 
+function saveReplayMetadata()
+{
+    let extendedSimState = Engine.GuiInterfaceCall("GetExtendedSimulationState");
+    Engine.SaveReplayMetadata(JSON.stringify({
+        "timeElapsed" : extendedSimState.timeElapsed,
+        "playerStates": extendedSimState.players,
+        "mapSettings": g_GameAttributes.settings
+    }));
+}
+
 /**
  * Leave the game
  * @param willRejoin If player is going to be rejoining a networked game.
@@ -518 +528 @@
 function leaveGame(willRejoin)
 {
     let extendedSimState = Engine.GuiInterfaceCall("GetExtendedSimulationState");
-    let simData = {
-        "timeElapsed" : extendedSimState.timeElapsed,
-        "playerStates": extendedSimState.players,
-        "mapSettings": g_GameAttributes.settings
-    };
 
-    if (!g_IsReplay)
-        Engine.SaveReplayMetadata(JSON.stringify(simData));
-
     if (!willRejoin &&
-        simData.playerStates[Engine.GetPlayerID()] &&
-        simData.playerStates[Engine.GetPlayerID()].state == "active")
+        extendedSimState.players[Engine.GetPlayerID()] &&
+        extendedSimState.players[Engine.GetPlayerID()].state == "active")
         resignGame(true);
 
     // Before ending the game
@@ -541 +543 @@
         Engine.SendUnregisterGame();
 
     Engine.SwitchGuiPage("page_summary.xml", {
-        "sim": simData,
+        "sim": {
+            "timeElapsed" : extendedSimState.timeElapsed,
+            "playerStates": extendedSimState.players,
+            "mapSettings": g_GameAttributes.settings
+        },
         "gui": {
             "assignedPlayer": Engine.GetPlayerID(),
             "disconnected": g_Disconnected,

source/ps/Game.cpp

@@ -110 +110 @@
     delete m_ReplayStream;
 }
 
+void CGame::SaveReplayMetadata(ScriptInterface *scriptInterface, jsval globalObject){
+    m_ReplayLogger->SaveReplayMetadata(scriptInterface, globalObject);
+}
+
 void CGame::SetTurnManager(CNetTurnManager* turnManager)
 {
     if (m_TurnManager)

source/ps/Game.h

@@ -181 +181 @@
     inline std::string GetReplayPath() const
     {   return m_ReplayPath; }
 
+    void SaveReplayMetadata(ScriptInterface *scriptInterface, jsval globalObject);
+
     /**
      * Replace the current turn manager.
      * This class will take ownership of the pointer.

source/ps/GameSetup/GameSetup.cpp

@@ -701 +701 @@
 
 void EndGame()
 {
+    if (g_Game != NULL)
+        g_Game->SaveReplayMetadata(g_GUI->GetActiveGUI()->GetScriptInterface().get(), g_GUI->GetActiveGUI()->GetGlobalObject());
+
     SAFE_DELETE(g_NetClient);
     SAFE_DELETE(g_NetServer);
     SAFE_DELETE(g_Game);

source/ps/Replay.cpp

@@ -20 +20 @@
 #include "Replay.h"
 
 #include "graphics/TerrainTextureManager.h"
+#include "gui/GUIManager.h"
 #include "lib/timer.h"
 #include "lib/file/file_system.h"
 #include "lib/res/h_mgr.h"
 #include "lib/tex/tex.h"
+#include "ps/CLogger.h"
 #include "ps/Game.h"
 #include "ps/Loader.h"
 #include "ps/Mod.h"
@@ -61 +63 @@
     delete m_Stream;
 }
 
+void CReplayLogger::SaveReplayMetadata(ScriptInterface *scriptInterface, jsval globalObject)
+{
+    JSContext* cx = scriptInterface->GetContext();
+    JSAutoRequest rq(cx);
+
+    JS::RootedValue data(cx);
+    JS::RootedValue global(cx, globalObject);
+    bool ok = scriptInterface->CallFunction(global, "saveReplayMetadata", &data);
+    if (!ok)
+        LOGERROR("Could not save replay metadata");
+}
+
 void CReplayLogger::StartGame(JS::MutableHandleValue attribs)
 {
     // Add timestamp, since the file-modification-date can change

source/ps/Replay.h

@@ -1 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -52 +52 @@
      * Remember the directory containing the commands.txt file, so that we can save additional files to it.
      */
     virtual OsPath GetDirectory() const = 0;
+
+    virtual void SaveReplayMetadata(ScriptInterface *scriptInterface, jsval globalObject) = 0;
 };
 
 /**
@@ -64 +66 @@
     virtual void Turn(u32 UNUSED(n), u32 UNUSED(turnLength), std::vector<SimulationCommand>& UNUSED(commands)) { }
     virtual void Hash(const std::string& UNUSED(hash), bool UNUSED(quick)) { }
     virtual OsPath GetDirectory() const { return OsPath(); }
+    virtual void SaveReplayMetadata(ScriptInterface *scriptInterface, jsval globalObject){}
 };
 
 /**
@@ -80 +83 @@
     virtual void Turn(u32 n, u32 turnLength, std::vector<SimulationCommand>& commands);
     virtual void Hash(const std::string& hash, bool quick);
     virtual OsPath GetDirectory() const;
+    virtual void SaveReplayMetadata(ScriptInterface *scriptInterface, jsval globalObject);
 
 private:
     ScriptInterface& m_ScriptInterface;