From 2ca0a20f81bd29cb3a3f5354fb489a7d0d587563 Mon Sep 17 00:00:00 2001 From: leper Date: Sun, 12 Jan 2014 23:13:24 +0000 Subject: [PATCH] Fix a bug in TestAllMemberFunction and initialize a variable in cmpBattleDetection. Refs #2372. This was SVN commit r14579. --- .../data/mods/public/simulation/components/BattleDetection.js | 1 + binaries/data/mods/public/simulation/components/UnitAI.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/binaries/data/mods/public/simulation/components/BattleDetection.js b/binaries/data/mods/public/simulation/components/BattleDetection.js index 0cee4681f2..5e1b35b572 100644 --- a/binaries/data/mods/public/simulation/components/BattleDetection.js +++ b/binaries/data/mods/public/simulation/components/BattleDetection.js @@ -36,6 +36,7 @@ BattleDetection.prototype.Init = function() this.damage = 0; // Damage counter. Accumulative damage done over the current timer period. this.damageRecord = []; // Damage record. Array of elements representing total damage done in a given timer cycle. this.alertness = 0; // Alertness level. Incremented if damage rate exceeds 'damageRateThreshold' over a given timer period and decremented if it does not. + this.state = "PEACE"; }; BattleDetection.prototype.setState = function(state) diff --git a/binaries/data/mods/public/simulation/components/UnitAI.js b/binaries/data/mods/public/simulation/components/UnitAI.js index 91ff3d481f..3d0aa83e8a 100644 --- a/binaries/data/mods/public/simulation/components/UnitAI.js +++ b/binaries/data/mods/public/simulation/components/UnitAI.js @@ -5600,7 +5600,7 @@ UnitAI.prototype.TestAllMemberFunction = function(funcname, args) for each (var ent in members) { var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI); - if (!cmpUnitAI[funcname].apply(cmpUnitAI, args)); + if (!cmpUnitAI[funcname].apply(cmpUnitAI, args)) return false; } return true;