Ticket #3551: t3551_prohibit_all_cheats_when_cheats_are_disabled_v3.patch

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

@@ -681 +681 @@
     Engine.PushGuiPage("page_manual.xml", {"page": "manual/intro", "title":translate("Manual"), "url":"http://trac.wildfiregames.com/wiki/0adManual", "callback": "resumeGame"});
 }
 
 function toggleDeveloperOverlay()
 {
-    // The developer overlay is disabled in ranked games
-    if (Engine.HasXmppClient() && Engine.IsRankedGame())
+    // The developer overlay is disabled when cheats are disabled
+    if (g_IsObserver || !g_SimState.players[Engine.GetPlayerID()].cheatsEnabled)
         return;
 
     var devCommands = Engine.GetGUIObjectByName("devCommands");
     if (devCommands.hidden)
         submitChatDirectly(translate("The Developer Overlay was opened."));

binaries/data/mods/public/simulation/helpers/Commands.js

@@ -98 +98 @@
         data.cmpPlayer.TributeResource(cmd.player, cmd.amounts);
     },
 
     "control-all": function(player, cmd, data)
     {
+        if (!data.cmpPlayer.GetCheatsEnabled())
+            return;
+
         data.cmpPlayer.SetControlAllUnits(cmd.flag);
     },
 
     "reveal-map": function(player, cmd, data)
     {
+        if (!data.cmpPlayer.GetCheatsEnabled())
+            return;
+
         // Reveal the map for all players, not just the current player,
         // primarily to make it obvious to everyone that the player is cheating
         var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
         cmpRangeManager.SetLosRevealAll(-1, cmd.enable);
     },
@@ -552 +558 @@
         });
     },
 
     "promote": function(player, cmd, data)
     {
-        // No need to do checks here since this is a cheat anyway
+        if (!data.cmpPlayer.GetCheatsEnabled())
+            return;
+
         var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
         cmpGuiInterface.PushNotification({"type": "chat", "players": [player], "message": "(Cheat - promoted units)"});
 
         for each (var ent in cmd.entities)
         {