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

Two early returns. Refs #3265.

Browse Source 
This was SVN commit r17813.
This commit is contained in:
elexis
2016-03-02 13:42:47 +00:00
parent 163af24a6c
commit 012b686e7c
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/simulation/components/Player.js
+15 -17
View File
@@ -363,27 +363,25 @@ Player.prototype.GetTeam = function()
Player.prototype.SetTeam = function(team)
{
if (!this.teamsLocked)
{
this.team = team;
if (this.teamsLocked)
return;
var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
if (cmpPlayerManager && this.team != -1)
this.team = team;
// Set all team members as allies
let cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
if (cmpPlayerManager && this.team != -1)
for (let i = 0; i < cmpPlayerManager.GetNumPlayers(); ++i)
{
// Set all team members as allies
for (var i = 0; i < cmpPlayerManager.GetNumPlayers(); ++i)
{
var cmpPlayer = Engine.QueryInterface(cmpPlayerManager.GetPlayerByID(i), IID_Player);
if (this.team == cmpPlayer.GetTeam())
{
this.SetAlly(i);
cmpPlayer.SetAlly(this.playerID);
}
}
let cmpPlayer = Engine.QueryInterface(cmpPlayerManager.GetPlayerByID(i), IID_Player);
if (this.team != cmpPlayer.GetTeam())
continue;
this.SetAlly(i);
cmpPlayer.SetAlly(this.playerID);
}
Engine.BroadcastMessage(MT_DiplomacyChanged, {"player": this.playerID});
}
Engine.BroadcastMessage(MT_DiplomacyChanged, { "player": this.playerID });
};
Player.prototype.SetLockTeams = function(value)