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

Fixed bug where players would not initialize resource counts properly from scenario

Browse Source 
This was SVN commit r8652.
This commit is contained in:
historic_bruno 2010-11-19 05:05:45 +00:00
parent f236fb7bd1
commit f20a6dcfc8
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
binaries/data/mods/public/gui/gamesetup/gamesetup.js
View File

@ -189,7 +189,7 @@ function init(attribs)
team.onSelectionChange = function()
{ // Update team
if (this.selected != -1)
g_GameAttributes.settings.PlayerData[playerID].Team = this.list_data[this.selected];
g_GameAttributes.settings.PlayerData[playerID].Team = this.selected - 1;
if (!g_IsInGuiUpdate)
onGameAttributesChange();
@ -664,7 +664,7 @@ function onGameAttributesChange()
{
// TODO: If scenario settings can be changed, handle that (using dropdowns rather than textboxes)
pCivText.caption = g_CivData[civ].Name;
pTeamText.caption = (team && team >= 0) ? team+1 : "-";
pTeamText.caption = (team !== undefined && team >= 0) ? team+1 : "-";
pCivText.hidden = false;
pCiv.hidden = true;
pTeamText.hidden = false;
@ -679,7 +679,7 @@ function onGameAttributesChange()
// Set dropdown values
pCiv.selected = (civ ? pCiv.list_data.indexOf(civ) : 0);
pTeam.selected = (team ? pTeam.list_data.indexOf(team) : 0);
pTeam.selected = (team !== undefined && team >= 0) ? team+1 : 0;
}
}
}

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

@ -113,7 +113,14 @@ Player.prototype.UnBlockTrainingQueue = function()
Player.prototype.SetResourceCounts = function(resources)
{
this.resourceCount = resources;
if (resources.food !== undefined)
this.resourceCount.food = resources.food;
if (resources.wood !== undefined)
this.resourceCount.wood = resources.wood;
if (resources.stone !== undefined)
this.resourceCount.stone = resources.stone;
if (resources.metal !== undefined)
this.resourceCount.metal = resources.metal;
};
Player.prototype.GetResourceCounts = function()