Ticket #4284: restart-menu.diff

session/menu.js

@@ -2 +2 @@
 const MARGIN = 4;
 
 // Includes the main menu button
-const NUM_BUTTONS = 9;
+const NUM_BUTTONS = 10;
 
 // Regular menu buttons
 const BUTTON_HEIGHT = 32;
@@ -105 +105 @@
     togglePause();
 }
 
+function restartMenuButton()
+{
+    closeOpenDialogs();
+    pauseGame();
+
+    if (g_GameAttributes.settings.mapType == "random")
+        messageBox(
+            400, 200,
+            translate("Are you sure you want to restart the game?"),
+            translate("Confirmation"),
+            [translate("No"), translate("Yes"), translate("Reseed")],
+            [resumeGame, restartGame, restartGame],
+            [null,false,true]
+        );
+    else
+        messageBox(
+            400, 200,
+            translate("Are you sure you want to restart the game?"),
+            translate("Confirmation"),
+            [translate("No"), translate("Yes")],
+            [resumeGame, restartGame]
+        );
+}
+
 function resignMenuButton()
 {
     closeOpenDialogs();

session/menu.xml

@@ -77 +77 @@
             <action on="Press">togglePause();</action>
         </object>
 
+        <!-- Restart button -->
+        <object type="button"
+            name="menuRestartButton"
+            style="StoneButtonFancy"
+            size="0 192 100% 220"
+            tooltip_style="sessionToolTip" enabled="false"
+        >
+            <translatableAttribute id="caption">Restart</translatableAttribute>
+            <action on="Press">restartMenuButton();</action>
+        </object>
+
         <!-- Resign button -->
         <object type="button"
             name="menuResignButton"
             style="StoneButtonFancy"
-            size="0 192 100% 220"
+            size="0 224 100% 252"
             tooltip_style="sessionToolTip"
         >
             <translatableAttribute id="caption">Resign</translatableAttribute>
@@ -92 +103 @@
         <object type="button"
             name="menuExitButton"
             style="StoneButtonFancy"
-            size="0 224 100% 252"
+            size="0 256 100% 284"
             tooltip_style="sessionToolTip"
         >
             <translatableAttribute id="caption">Exit</translatableAttribute>

session/session.js

@@ -248 +248 @@
             restoreSavedGameData(initData.savedGUIData);
 
         Engine.GetGUIObjectByName("gameSpeedButton").hidden = g_IsNetworked;
+        Engine.GetGUIObjectByName("menuRestartButton").enabled = !g_IsNetworked;
+
     }
     else // Needed for autostart loading option
     {
@@ -517 +519 @@
 }
 
 /**
- * Resign a player.
- * @param leaveGameAfterResign If player is quitting after resignation.
+ * Restart the game
+ * @param reseed If the random map should be re-seeded.
  */
+function restartGame(reseed) 
+{
+    let playerId = Engine.GetPlayerID();
+    let gameAttributes = g_GameAttributes;
+
+    if (reseed)
+        gameAttributes.settings.Seed = Math.floor(Math.random() * Math.pow(2, 32));
+
+    Engine.EndGame();
+    Engine.StartGame(gameAttributes, playerId);
+    Engine.SwitchGuiPage("page_loading.xml", {
+        "attribs": gameAttributes,
+        "isNetworked" : g_IsNetworked,
+        "playerAssignments": g_PlayerAssignments
+    });
+}
+
 function resignGame(leaveGameAfterResign)
 {
     if (g_IsObserver || g_Disconnected)