Ticket #2030: saveAs.patch

binaries/data/mods/public/gui/savedgames/load.js

@@ -14 +14 @@
 
     var date = t.getFullYear()+"-"+twoDigits(1+t.getMonth())+"-"+twoDigits(t.getDate());
     var time = twoDigits(t.getHours())+":"+twoDigits(t.getMinutes())+":"+twoDigits(t.getSeconds());
-    return "["+date+" "+time+"] "+metadata.initAttributes.map;
+    return "["+date+" "+time+"] "+metadata.initAttributes.map+(metadata.savename?" ("+metadata.savename+")":"");
 }
 
 function init()

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

@@ -9 +9 @@
 const MARGIN = 4;
 
 // Includes the main menu button
-const NUM_BUTTONS = 8;
+const NUM_BUTTONS = 9;
 
 // Regular menu buttons
 const BUTTON_HEIGHT = 32;
@@ -148 +148 @@
     messageBox(400, 200, "Are you sure you want to quit?", "Confirmation", 0, btCaptions, btCode);
 }
 
+function openSaveAs()
+{
+    closeMenu();
+    closeOpenDialogs();
+    pauseGame();
+    
+    getGUIObjectByName("saveAsPanel").focus();
+    getGUIObjectByName("saveAsPanel").hidden = false;
+    
+}
+
+function closeSaveAs()
+{
+    getGUIObjectByName("saveAsPanel").hidden = true;
+
+    resumeGame();
+}
+
+
 function openDeleteDialog(selection)
 {
     closeMenu();

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

@@ -427 +427 @@
     </object>
 
     <!-- ================================  ================================ -->
+    <!-- Save As Window --> 
+    <!-- ================================  ================================ -->
+        <object name="saveAsPanel"
+            style="StoneDialog"
+            type="image"
+            size="50%-180 50%-64 50%+180 50%+64"
+            hidden="true"
+            z="200"
+            >
+            <object type="text" style="TitleText" size="50%-96 -16 50%+96 16">Save Game As</object>
+            <object size="25%-64 35%-12 25%+64 35%+12" type="text"  style="LeftLabelText">
+                Save As:
+            </object>
+            <object name="savegameName" size="25% 35%-12 95%-8 35%+12" type="input" style="StoneInput" max_length="80">
+                savegame
+            </object>
+
+            <!-- Cancel button -->
+            <object type="button"
+                style="StoneButton"
+                size="75%-64 100%-52 75%+64 100%-24"
+                tooltip_style="sessionToolTip"
+                >
+                Cancel
+                <action on="Press">closeSaveAs();</action>
+            </object>
+            <!-- Save button -->
+            <object type="button"
+                style="StoneButton"
+                size="25%-64 100%-52 25%+64 100%-24"
+                tooltip_style="sessionToolTip"
+                >
+                Save
+                <action on="Press">closeSaveAs();Engine.SaveGameAs(getGUIObjectByName("savegameName").caption);</action>
+            </object>
+        </object>
+
+    <!-- ================================  ================================ -->
     <!-- Settings Window -->
     <!-- ================================  ================================ -->
         <object name="settingsDialogPanel"
@@ -707 +745 @@
             </action>
         </object>
 
+        <!-- Save game as button -->
+        <object type="button"
+            name="saveGameAsButton"
+            style="StoneButtonFancy"
+            size="0 64 100% 92"
+            tooltip_style="sessionToolTip"
+        >
+            Save As
+            <action on="Press">
+            
+            openSaveAs();
+            </action>
+        </object>
+
         <!-- Chat button -->
         <object type="button"
             name="chatButton"
             style="StoneButtonFancy"
-            size="0 64 100% 92"
+            size="0 96 100% 124"
             tooltip_style="sessionToolTip"
         >
             Chat
@@ -722 +774 @@
         <object type="button"
             name="menuResignButton"
             style="StoneButtonFancy"
-            size="0 96 100% 124"
+            size="0 128 100% 156"
             tooltip_style="sessionToolTip"
         >
             Resign
@@ -733 +785 @@
         <object type="button"
             name="menuExitButton"
             style="StoneButtonFancy"
-            size="0 128 100% 156"
+            size="0 160 100% 188"
             tooltip_style="sessionToolTip"
         >
             Exit
@@ -744 +796 @@
         <object type="button"
             name="pauseButton"
             style="StoneButtonFancy"
-            size="0 160 100% 188"
+            size="0 192 100% 220"
             tooltip_style="sessionToolTip"
         >
             <object name="pauseButtonText" type="text" style="CenteredButtonText" ghost="true">Pause</object>
@@ -755 +807 @@
         <object type="button"
             name="manualButton"
             style="StoneButtonFancy"
-            size="0 192 100% 220"
+            size="0 224 100% 252"
             tooltip_style="sessionToolTip"
         >
             Manual

source/gui/scripting/ScriptFunctions.cpp

@@ -266 +266 @@
         LOGERROR(L"Failed to save game");
 }
 
+void SaveGameAs(void* cbdata, std::wstring prefix)
+{
+    CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
+
+    if (SavedGames::Save(prefix, *g_Game->GetSimulation2(), guiManager, g_Game->GetPlayerID()) < 0)
+        LOGERROR(L"Failed to save game as");
+}
+
 void SetNetworkGameAttributes(void* cbdata, CScriptVal attribs)
 {
     CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
@@ -670 +678 @@
     scriptInterface.RegisterFunction<std::vector<CScriptValRooted>, &GetSavedGames>("GetSavedGames");
     scriptInterface.RegisterFunction<bool, std::wstring, &DeleteSavedGame>("DeleteSavedGame");
     scriptInterface.RegisterFunction<void, &SaveGame>("SaveGame");
+    scriptInterface.RegisterFunction<void, std::wstring, &SaveGameAs>("SaveGameAs");
     scriptInterface.RegisterFunction<void, &QuickSave>("QuickSave");
     scriptInterface.RegisterFunction<void, &QuickLoad>("QuickLoad");
 

source/ps/SavedGame.cpp

@@ -1 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2013 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -68 +68 @@
     simulation.GetScriptInterface().SetProperty(metadata.get(), "version_minor", SAVED_GAME_VERSION_MINOR);
     simulation.GetScriptInterface().SetProperty(metadata.get(), "time", (double)now);
     simulation.GetScriptInterface().SetProperty(metadata.get(), "player", playerID);
+    simulation.GetScriptInterface().SetProperty(metadata.get(), "savename", prefix);
     simulation.GetScriptInterface().SetProperty(metadata.get(), "initAttributes", simulation.GetInitAttributes());
     if (gui)
     {

source/ps/SavedGame.h

@@ -1 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2013 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify