mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-29 03:52:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename some occurences of *Man to cmp*Manager.

Browse Source 
This was SVN commit r16948.
This commit is contained in:
leper
2015-08-29 22:49:42 +00:00
parent 2b1c128b66
commit 5a7b4e380a
3 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/simulation/components/AlertRaiser.js
+7 -9
View File
@@ -65,11 +65,10 @@ AlertRaiser.prototype.IncreaseAlertLevel = function()
players = [cmpOwnership.GetOwner()];
// Select production buildings to put "under alert", including the raiser itself if possible
var rangeMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
var level = this.GetLevel();
var buildings = rangeMan.ExecuteQuery(this.entity, 0, this.template.Range, players, IID_ProductionQueue);
var ownCmpProductionQueue = Engine.QueryInterface(this.entity, IID_ProductionQueue);
if (ownCmpProductionQueue)
var buildings = cmpRangeManager.ExecuteQuery(this.entity, 0, this.template.Range, players, IID_ProductionQueue);
if (Engine.QueryInterface(this.entity, IID_ProductionQueue))
buildings.push(this.entity);
for each (var building in buildings)
@@ -80,12 +79,11 @@ AlertRaiser.prototype.IncreaseAlertLevel = function()
}
// Select units to put under alert, according to their reaction to this level
var rangeMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
var level = this.GetLevel();
var units = rangeMan.ExecuteQuery(this.entity, 0, this.template.Range, players, IID_UnitAI).filter( function(e){
var cmpUnitAI = Engine.QueryInterface(e, IID_UnitAI);
return (!cmpUnitAI.IsUnderAlert() && cmpUnitAI.ReactsToAlert(level));
});
var units = cmpRangeManager.ExecuteQuery(this.entity, 0, this.template.Range, players, IID_UnitAI).filter(ent => {
var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
return !cmpUnitAI.IsUnderAlert() && cmpUnitAI.ReactsToAlert(level);
});
for each (var unit in units)
{
binaries/data/mods/public/simulation/components/GuiInterface.js
+16 -21
View File
@@ -54,11 +54,11 @@ GuiInterface.prototype.GetSimulationState = function(player)
"players": []
};
var cmpPlayerMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
var n = cmpPlayerMan.GetNumPlayers();
var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
var n = cmpPlayerManager.GetNumPlayers();
for (var i = 0; i < n; ++i)
{
var playerEnt = cmpPlayerMan.GetPlayerByID(i);
var playerEnt = cmpPlayerManager.GetPlayerByID(i);
var cmpPlayerEntityLimits = Engine.QueryInterface(playerEnt, IID_EntityLimits);
var cmpPlayer = Engine.QueryInterface(playerEnt, IID_Player);
@@ -148,11 +148,11 @@ GuiInterface.prototype.GetSimulationState = function(player)
ret.barterPrices = cmpBarter.GetPrices();
// Add basic statistics to each player
var cmpPlayerMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
var n = cmpPlayerMan.GetNumPlayers();
var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
var n = cmpPlayerManager.GetNumPlayers();
for (var i = 0; i < n; ++i)
{
var playerEnt = cmpPlayerMan.GetPlayerByID(i);
var playerEnt = cmpPlayerManager.GetPlayerByID(i);
var cmpPlayerStatisticsTracker = Engine.QueryInterface(playerEnt, IID_StatisticsTracker);
if (cmpPlayerStatisticsTracker)
ret.players[i].statistics = cmpPlayerStatisticsTracker.GetBasicStatistics();
@@ -173,11 +173,11 @@ GuiInterface.prototype.GetExtendedSimulationState = function(player)
var ret = this.GetSimulationState();
// Add statistics to each player
var cmpPlayerMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
var n = cmpPlayerMan.GetNumPlayers();
var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
var n = cmpPlayerManager.GetNumPlayers();
for (var i = 0; i < n; ++i)
{
var playerEnt = cmpPlayerMan.GetPlayerByID(i);
var playerEnt = cmpPlayerManager.GetPlayerByID(i);
var cmpPlayerStatisticsTracker = Engine.QueryInterface(playerEnt, IID_StatisticsTracker);
if (cmpPlayerStatisticsTracker)
ret.players[i].statistics = cmpPlayerStatisticsTracker.GetStatistics();
@@ -610,8 +610,8 @@ GuiInterface.prototype.GetTemplateData = function(player, extendedName)
GuiInterface.prototype.GetTechnologyData = function(player, name)
{
var cmpTechTempMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager);
var template = cmpTechTempMan.GetTemplate(name);
var cmpTechnologyTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager);
var template = cmpTechnologyTemplateManager.GetTemplate(name);
if (!template)
{
@@ -750,9 +750,7 @@ GuiInterface.prototype.GetNotifications = function()
GuiInterface.prototype.GetAvailableFormations = function(player, wantedPlayer)
{
var cmpPlayerMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
var cmpPlayer = Engine.QueryInterface(cmpPlayerMan.GetPlayerByID(wantedPlayer), IID_Player);
return cmpPlayer.GetFormations();
return QueryPlayerIDInterface(wantedPlayer).GetFormations();
};
GuiInterface.prototype.GetFormationRequirements = function(player, data)
@@ -826,7 +824,7 @@ GuiInterface.prototype.GetAllBuildableEntities = function(player, cmd)
GuiInterface.prototype.SetSelectionHighlight = function(player, cmd)
{
var cmpPlayerMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
var playerColors = {}; // cache of owner -> color map
for each (var ent in cmd.entities)
@@ -845,7 +843,7 @@ GuiInterface.prototype.SetSelectionHighlight = function(player, cmd)
if (!color)
{
color = {"r":1, "g":1, "b":1};
var cmpPlayer = Engine.QueryInterface(cmpPlayerMan.GetPlayerByID(owner), IID_Player);
var cmpPlayer = Engine.QueryInterface(cmpPlayerManager.GetPlayerByID(owner), IID_Player);
if (cmpPlayer)
color = cmpPlayer.GetColor();
playerColors[owner] = color;
@@ -912,8 +910,7 @@ GuiInterface.prototype.GetPlayerEntities = function(player)
*/
GuiInterface.prototype.DisplayRallyPoint = function(player, cmd)
{
var cmpPlayerMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
var cmpPlayer = Engine.QueryInterface(cmpPlayerMan.GetPlayerByID(player), IID_Player);
var cmpPlayer = QueryPlayerIDInterface(player);
// If there are some rally points already displayed, first hide them
for each (var ent in this.entsRallyPointsDisplayed)
@@ -1593,9 +1590,7 @@ GuiInterface.prototype.SetWallPlacementPreview = function(player, cmd)
*/
GuiInterface.prototype.GetFoundationSnapData = function(player, data)
{
var cmpTemplateMgr = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
var template = cmpTemplateMgr.GetTemplate(data.template);
var template = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager).GetTemplate(data.Template);
if (!template)
{
warn("[GetFoundationSnapData] Failed to load template '" + data.template + "'");
binaries/data/mods/public/simulation/components/Health.js
+2 -2
View File
@@ -254,8 +254,8 @@ Health.prototype.CreateCorpse = function(leaveResources)
// Either creates a static local version of the current entity, or a
// persistent corpse retaining the ResourceSupply element of the parent.
var cmpTempMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
var templateName = cmpTempMan.GetCurrentTemplateName(this.entity);
var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
var templateName = cmpTemplateManager.GetCurrentTemplateName(this.entity);
var corpse;
if (leaveResources)
corpse = Engine.AddEntity("resource|" + templateName);