real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

fix tests (fixes #2326)

Browse Source 
+ small code cleanup
+ move guiInterface call to GetEntityState
refs #2154

This was SVN commit r14405.
This commit is contained in:
sanderd17 2013-12-27 08:49:47 +00:00
parent e4a124e768
commit f33d3193ca
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
binaries/data/mods/public/simulation/components/GuiInterface.js
View File

@ -285,6 +285,16 @@ GuiInterface.prototype.GetEntityState = function(player, ent)
};
}
var cmpAlertRaiser = Engine.QueryInterface(ent, IID_AlertRaiser);
if(cmpAlertRaiser)
{
ret.alertRaiser = {
"level": cmpAlertRaiser.GetLevel(),
"canIncreaseLevel": cmpAlertRaiser.CanIncreaseLevel(),
"hasRaisedAlert": cmpAlertRaiser.HasRaisedAlert(),
};
}
var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
ret.visibility = cmpRangeManager.GetLosVisibility(ent, player, false);
@ -376,16 +386,6 @@ GuiInterface.prototype.GetExtendedEntityState = function(player, ent)
ret.resourceCarrying = cmpResourceGatherer.GetCarryingStatus();
}
var cmpAlertRaiser = Engine.QueryInterface(ent, IID_AlertRaiser);
if(cmpAlertRaiser)
{
ret.alertRaiser = {
"level": cmpAlertRaiser.GetLevel(),
"canIncreaseLevel": cmpAlertRaiser.CanIncreaseLevel(),
"hasRaisedAlert": cmpAlertRaiser.HasRaisedAlert(),
};
}
var cmpResourceDropsite = Engine.QueryInterface(ent, IID_ResourceDropsite);
if (cmpResourceDropsite)
{

1
binaries/data/mods/public/simulation/components/tests/test_GuiInterface.js
View File

@ -1,4 +1,5 @@
Engine.LoadComponentScript("interfaces/Attack.js");
Engine.LoadComponentScript("interfaces/AlertRaiser.js");
Engine.LoadComponentScript("interfaces/Barter.js");
Engine.LoadComponentScript("interfaces/Builder.js");
Engine.LoadComponentScript("interfaces/DamageReceiver.js");

8
binaries/data/mods/public/simulation/helpers/Commands.js
View File

@ -424,18 +424,18 @@ function ProcessCommand(player, cmd)
break;
case "increase-alert-level":
for each (var raiser in entities)
for each (var ent in entities)
{
var cmpAlertRaiser = Engine.QueryInterface(raiser, IID_AlertRaiser);
var cmpAlertRaiser = Engine.QueryInterface(ent, IID_AlertRaiser);
if (!cmpAlertRaiser || !cmpAlertRaiser.IncreaseAlertLevel())
notifyAlertFailure(player);
}
break;
case "alert-end":
for each (var raiser in entities)
for each (var ent in entities)
{
var cmpAlertRaiser = Engine.QueryInterface(raiser, IID_AlertRaiser);
var cmpAlertRaiser = Engine.QueryInterface(ent, IID_AlertRaiser);
if (cmpAlertRaiser)
cmpAlertRaiser.EndOfAlert();
}