Ticket #3546: 3546.1.diff

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

@@ -57 +57 @@
 
 var g_ChatMessages = [];
 
+// Set the cheat display message for guest players only once to avoid inconvenience.
+var g_AwareOfCheats = false;
+
 // Data caches
 var g_MapData = {};
 var g_CivData = {};
@@ -1846 +1849 @@
     Engine.GetGUIObjectByName("moreOptions").hidden = !show;
 }
 
+/**
+ * Shows or hides the cheat warning menu.
+ * @param <bool> show
+ */
+function showCheatEnabledWarning(show)
+{
+    Engine.GetGUIObjectByName("cheatWarningText").hidden = !show;
+}
+
 function toggleReady()
 {
-    g_IsReady = !g_IsReady;
-    if (g_IsReady)
+    if (!g_IsReady && g_IsNetworked && !g_IsController && g_GameAttributes.settings.CheatsEnabled && !g_AwareOfCheats)
     {
-        Engine.SendNetworkReady(1);
-        Engine.GetGUIObjectByName("startGame").caption = translate("I'm not ready");
-        Engine.GetGUIObjectByName("startGame").tooltip = translate("State that you are not ready to play.");
+        Engine.GetGUIObjectByName("cheatWarningText").hidden = !g_GameAttributes.settings.CheatsEnabled;
+        g_AwareOfCheats = true;
     }
     else
     {
-        Engine.SendNetworkReady(0);
-        Engine.GetGUIObjectByName("startGame").caption = translate("I'm ready!");
-        Engine.GetGUIObjectByName("startGame").tooltip = translate("State that you are ready to play!");
+        g_IsReady = !g_IsReady;
+        if (g_IsReady)
+        {
+            Engine.SendNetworkReady(1);
+            Engine.GetGUIObjectByName("startGame").caption = translate("I'm not ready");
+            Engine.GetGUIObjectByName("startGame").tooltip = translate("State that you are not ready to play.");
+        }
+        else
+        {
+            Engine.SendNetworkReady(0);
+            Engine.GetGUIObjectByName("startGame").caption = translate("I'm ready!");
+            Engine.GetGUIObjectByName("startGame").tooltip = translate("State that you are ready to play!");
+        }
     }
 }
 

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

@@ -218 +218 @@
                 size="20 100%-56 100%-312 100%-24"
             />
 
+            <object name="cheatWarningText" type="image" sprite="ModernDialog" size="50%-160 60%-195 50%+160 30%+250" z="70" hidden="true">
+                <object style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
+                    <translatableAttribute id="caption">Warning</translatableAttribute>
+                </object>
+                <object size="0%-15 0% 75%-15 100%" type="text" style="ModernRightLabelText">
+                    <translatableAttribute id="caption">Cheats were enabled!</translatableAttribute>
+                </object>
+                <object size="100%-154 100%-52 100%-14 100%-24" type="button" style="StoneButton">
+                    <translatableAttribute id="caption">I'm Ready!</translatableAttribute>
+                    <action on="Press">
+                        toggleReady();
+                        showCheatEnabledWarning(false);
+                    </action>
+                </object>
+                <object size="50%-150 100%-52 50%-10 100%-24" type="button" style="StoneButton">
+                    <translatableAttribute id="caption">Cancel</translatableAttribute>
+                    <action on="Press">
+                        showCheatEnabledWarning(false);
+                    </action>
+                </object>
+            </object>
+
             <!-- Start/Ready Button -->
             <object
                 name="startGame"