Changeset 9602 for ps

Timestamp:

06/09/11 19:01:01 (14 years ago)

Author:

philip

Message:

Clean up some formatting and comments.

Location:

ps/trunk/binaries/data/mods/public/simulation

Files:

• components/UnitAI.js (modified) (1 diff)
• helpers/Player.js (modified) (1 diff)

ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js

@@ -2007 +2007 @@
 UnitAI.prototype.LeaveFoundation = function(target)
 {
-    // TODO: we should verify this is a friendly foundation, otherwise
-    // there's no reason we should let them build here
-
     // If we're already being told to leave a foundation, then
     // ignore this new request so we don't end up being too indecisive

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

@@ -192 +192 @@
 }
 
+/**
+ * Returns true if the entity 'target' is owned by an ally of
+ * the owner of 'entity'.
+ */
 function IsOwnedByAlly(entity, target)
 {
-  //figure out which player controls us
-  var cmpOwnership = Engine.QueryInterface(entity, IID_Ownership);
-  var owner = 0;
-  if (cmpOwnership)
-    owner = cmpOwnership.GetOwner();
-
-  var playerMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
-  var player = Engine.QueryInterface(playerMan.GetPlayerByID(owner), IID_Player);
-  // Get our diplomacy array
-  var diplomacy = player.GetDiplomacy();
-
-  //figure out which player controls the foundation being built
-  var cmpOwnershipTarget = Engine.QueryInterface(target, IID_Ownership);
-  var targetOwner = 0;
-  if (cmpOwnershipTarget)
-    targetOwner = cmpOwnershipTarget.GetOwner();
-
-  //If we don't like the guy with the building, ignore their request to move
-  return owner==targetOwner || diplomacy[targetOwner - 1] > 0;
+    // Figure out which player controls us
+    var owner = 0;
+    var cmpOwnership = Engine.QueryInterface(entity, IID_Ownership);
+    if (cmpOwnership)
+        owner = cmpOwnership.GetOwner();
+
+    // Figure out which player controls the foundation being built
+    var targetOwner = 0;
+    var cmpOwnershipTarget = Engine.QueryInterface(target, IID_Ownership);
+    if (cmpOwnershipTarget)
+        targetOwner = cmpOwnershipTarget.GetOwner();
+
+    // Players are always implicitly their own ally
+    if (owner == targetOwner)
+        return true;
+
+    // Get our diplomacy array
+    var playerMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+    var player = Engine.QueryInterface(playerMan.GetPlayerByID(owner), IID_Player);
+    var diplomacy = player.GetDiplomacy();
+
+    // Check for allied diplomacy status
+    if (diplomacy[targetOwner - 1] > 0)
+        return true;
+
+    return false;
 }