abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix some script errors

Browse Source 
This was SVN commit r8062.
This commit is contained in:
Ykkrosh 2010-09-03 20:04:11 +00:00
parent 7f680afd0a
commit 5cc04d44f8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
binaries/data/mods/public/simulation/components/Formation.js
View File

@ -78,14 +78,14 @@ Formation.prototype.Disband = function()
};
/**
* Call UnitAI.ReplaceOrder on all members.
* Call obj.funcname(args) on UnitAI components of all members.
*/
Formation.prototype.ReplaceMemberOrders = function(type, data)
Formation.prototype.CallMemberFunction = function(funcname, args)
{
for each (var ent in this.members)
{
var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
cmpUnitAI.ReplaceOrder(type, data);
cmpUnitAI[funcname].apply(cmpUnitAI, args);
}
};

8
binaries/data/mods/public/simulation/components/UnitAI.js
View File

@ -159,7 +159,7 @@ var UnitFsmSpec = {
// then break up into individuals when close enough to it
var cmpFormation = Engine.QueryInterface(this.entity, IID_Formation);
cmpFormation.ReplaceMemberOrders("Attack", msg.data);
cmpFormation.CallMemberFunction("Attack", [msg.data.target, false]);
// TODO: we should wait until the target is killed, then
// move on to the next queued order.
@ -170,14 +170,14 @@ var UnitFsmSpec = {
"Order.Repair": function(msg) {
// TODO: see notes in Order.Attack
var cmpFormation = Engine.QueryInterface(this.entity, IID_Formation);
cmpFormation.ReplaceMemberOrders("Repair", msg.data);
cmpFormation.CallMemberFunction("Repair", [msg.data.target, false]);
cmpFormation.Disband();
},
"Order.Gather": function(msg) {
// TODO: see notes in Order.Attack
var cmpFormation = Engine.QueryInterface(this.entity, IID_Formation);
cmpFormation.ReplaceMemberOrders("Gather", msg.data);
cmpFormation.CallMemberFunction("Gather", [msg.data.target, false]);
cmpFormation.Disband();
},
@ -967,7 +967,7 @@ UnitAI.prototype.CanRepair = function(target)
// Verify that we're able to respond to Attack commands
var cmpBuilder = Engine.QueryInterface(this.entity, IID_Builder);
if (!cmpAttack)
if (!cmpBuilder)
return false;
// TODO: verify that this is a valid target