Changeset 21835 for ps

Timestamp:

06/03/18 18:40:44 (7 years ago)

Author:

temple

Message:

Always call SetPassabilityCircular -- Fix OOS after rejoin on square maps

Differential Revision: ​https://code.wildfiregames.com/D1555
Reviewed by: elexis
Fixes: #5186

File:

• ps/trunk/binaries/data/mods/public/simulation/helpers/Setup.js (modified) (3 diffs)

ps/trunk/binaries/data/mods/public/simulation/helpers/Setup.js

@@ -10 +10 @@
 
     if (settings.DefaultStance)
-    {
         for (let ent of Engine.GetEntitiesWithInterface(IID_UnitAI))
         {
@@ -16 +15 @@
             cmpUnitAI.SwitchToStance(settings.DefaultStance);
         }
-    }
 
     if (settings.RevealMap)
@@ -33 +31 @@
         }
 
-    if (settings.CircularMap)
-    {
-        let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
-        if (cmpRangeManager)
-            cmpRangeManager.SetLosCircular(true);
+    let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    if (cmpRangeManager)
+        cmpRangeManager.SetLosCircular(!!settings.CircularMap);
 
-        let cmpObstructionManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_ObstructionManager);
-        if (cmpObstructionManager)
-            cmpObstructionManager.SetPassabilityCircular(true);
-    }
+    let cmpObstructionManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_ObstructionManager);
+    if (cmpObstructionManager)
+        cmpObstructionManager.SetPassabilityCircular(!!settings.CircularMap);
 
-    if (settings.TriggerDifficulty != undefined)
+    if (settings.TriggerDifficulty !== undefined)
         Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger).SetDifficulty(settings.TriggerDifficulty);
     else if (settings.SupportedTriggerDifficulties) // used by Atlas and autostart games