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

Fix maps after ea72437739.

Browse Source 
Correctly fetch the civ from the player's Identity.
Also remove the notions of the CivChanged message, since it was
effectively deleted already.

Differential revision: https://code.wildfiregames.com/D4486
Reviewed by: @wraitii
Comments by: @bb, @Silier, @smiley, @Stan, @vladislavbelov
Fixes #6444

This was SVN commit r26872.
This commit is contained in:
Freagarach 2022-05-11 06:04:20 +00:00
parent 1f8705d8f7
commit 13d701e3d0
4 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js
View File

@ -137,10 +137,7 @@ Trigger.prototype.LoadAttackerTemplates = function()
Trigger.prototype.SetDisableTemplates = function()
{
for (let i = 1; i < TriggerHelper.GetNumberOfPlayers(); ++i)
{
let cmpPlayer = QueryPlayerIDInterface(i);
cmpPlayer.SetDisabledTemplates(disabledTemplates(cmpPlayer.GetCiv()));
}
QueryPlayerIDInterface(i).SetDisabledTemplates(disabledTemplates(QueryPlayerIDInterface(i, IID_Identity).GetCiv()));
};
/**

2
binaries/data/mods/public/maps/scripts/Regicide.js
View File

@ -5,7 +5,7 @@ Trigger.prototype.InitRegicideGame = function(msg)
let playersCivs = [];
for (let playerID = 1; playerID < TriggerHelper.GetNumberOfPlayers(); ++playerID)
playersCivs[playerID] = QueryPlayerIDInterface(playerID).GetCiv();
playersCivs[playerID] = QueryPlayerIDInterface(playerID, IID_Identity).GetCiv();
// Get all hero templates of these civs
let heroTemplates = {};

5
binaries/data/mods/public/simulation/components/Trainer.js
View File

@ -691,11 +691,6 @@ Trainer.prototype.Progress = function(id, allocatedTime)
return usedTime;
};
Trainer.prototype.OnCivChanged = function()
{
this.CalculateEntitiesMap();
};
Trainer.prototype.OnOwnershipChanged = function(msg)
{
if (msg.to != INVALID_PLAYER)

7
binaries/data/mods/public/simulation/components/interfaces/Player.js
View File

@ -1,10 +1,3 @@
/**
* Message of the form { "player": number, "from": string, "to": string }
* sent from Player component to warn other components when a player changed civs.
* This should only happen in Atlas.
*/
Engine.RegisterMessageType("CivChanged");
/**
* Message of the form { "player": number, "otherPlayer": number }
* sent from Player component when diplomacy changed for one player or between two players.