gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

test some components before use, adresses #2206

Browse Source 
This was SVN commit r14082.
This commit is contained in:
mimo
2013-11-03 17:18:43 +00:00
parent 53a270347a
commit 0362453035
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/simulation/components/UnitAI.js
+17 -6
View File
@@ -2934,7 +2934,11 @@ UnitAI.prototype.ReplaceOrder = function(type, data)
if (data && data.force)
{
if (this.IsFormationController())
Engine.QueryInterface(this.entity, IID_Formation).CallMemberFunction("UpdateWorkOrders", [type]);
{
var cmpFormation = Engine.QueryInterface(this.entity, IID_Formation);
if (cmpFormation)
cmpFormation.CallMemberFunction("UpdateWorkOrders", [type]);
}
else
this.UpdateWorkOrders(type);
}
@@ -3006,12 +3010,15 @@ UnitAI.prototype.UpdateWorkOrders = function(type)
if (this.IsFormationMember())
{
var cmpUnitAI = Engine.QueryInterface(this.formationController, IID_UnitAI);
for (var i = 0; i < cmpUnitAI.orderQueue.length; ++i)
if (cmpUnitAI)
{
if (isWorkType(cmpUnitAI.orderQueue[i].type))
for (var i = 0; i < cmpUnitAI.orderQueue.length; ++i)
{
this.workOrders = cmpUnitAI.orderQueue.slice(i);
return;
if (isWorkType(cmpUnitAI.orderQueue[i].type))
{
this.workOrders = cmpUnitAI.orderQueue.slice(i);
return;
}
}
}
}
@@ -3045,7 +3052,11 @@ UnitAI.prototype.BackToWork = function()
// And if the unit is in a formation, remove it from the formation
if (this.IsFormationMember())
Engine.QueryInterface(this.formationController, IID_Formation).RemoveMembers([this.entity]);
{
var cmpFormation = Engine.QueryInterface(this.formationController, IID_Formation);
if (cmpFormation)
cmpFormation.RemoveMembers([this.entity]);
}
this.workOrders = [];
return true;