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

A minor change.

Browse Source 
This was SVN commit r12099.
This commit is contained in:
O.Davoodi 2012-07-13 04:05:13 +00:00
parent d0a1a3bd50
commit 1233323e79
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////
// Constants
const DEFAULT_NETWORKED_MAP = "Oasis XI";
const DEFAULT_OFFLINE_MAP = "Punjab III";
const DEFAULT_NETWORKED_MAP = "Oasis X";
const DEFAULT_OFFLINE_MAP = "Oasis X";
// TODO: Move these somewhere like simulation\data\game_types.json, Atlas needs them too
const VICTORY_TEXT = ["Conquest", "None"];
@ -195,7 +195,8 @@ function initMain()
getGUIObjectByName("mapTypeText").hidden = false;
getGUIObjectByName("mapFilterSelection").hidden = true;
getGUIObjectByName("mapFilterText").hidden = false;
getGUIObjectByName("mapSelection").enabled = false;
getGUIObjectByName("mapSelectionText").hidden = false;
getGUIObjectByName("mapSelection").hidden = true;
// Disable player and game options controls
// TODO: Shouldn't players be able to choose their own assignment?
@ -401,11 +402,9 @@ function initCivNameList()
// Extract name/code, and skip civs that are explicitly disabled
// (intended for unusable incomplete civs)
var civList = [
{ "name": civ.Name, "code": civ.Code }
var civList = [ { "name": civ.Name, "code": civ.Code }
for each (civ in g_CivData)
if (civ.SelectableInGameSetup !== false)
];
if (civ.SelectableInGameSetup !== false) ];
// Alphabetically sort the list, ignoring case
civList.sort(sortNameIgnoreCase);
@ -413,10 +412,6 @@ function initCivNameList()
var civListNames = [ civ.name for each (civ in civList) ];
var civListCodes = [ civ.code for each (civ in civList) ];
// Add random civ to beginning of list
civListNames.unshift("[color=\"255 160 10 255\"]Random");
civListCodes.unshift("random");
// Update the dropdowns
for (var i = 0; i < MAX_PLAYERS; ++i)
{
@ -736,17 +731,6 @@ function launchGame()
return;
}
var numPlayers = g_GameAttributes.settings.PlayerData.length;
// Assign random civilizations to players with that choice
// (this is synchronized because we're the host)
var civs = [ civ.Code for each (civ in g_CivData) if (civ.SelectableInGameSetup !== false) ];
for (var i = 0; i < numPlayers; ++i)
{
if (g_GameAttributes.settings.PlayerData[i].Civ == "random")
g_GameAttributes.settings.PlayerData[i].Civ = civs[Math.floor(Math.random()*civs.length)];
}
if (g_IsNetworked)
{
Engine.SetNetworkGameAttributes(g_GameAttributes);
@ -755,6 +739,7 @@ function launchGame()
else
{
// Find the player ID which the user has been assigned to
var numPlayers = g_GameAttributes.settings.PlayerData.length;
var playerID = -1;
for (var i = 0; i < numPlayers; ++i)
{
@ -797,7 +782,7 @@ function onGameAttributesChange()
getGUIObjectByName("mapTypeText").caption = mapTypeSelection.list[idx];
var mapSelectionBox = getGUIObjectByName("mapSelection");
mapSelectionBox.selected = mapSelectionBox.list_data.indexOf(mapName);
getGUIObjectByName("mapSelectionText").caption = mapName;
initMapNameList();
}
@ -944,7 +929,7 @@ function onGameAttributesChange()
pTeam.hidden = true;
// Set text values
pCivText.caption = (civ != "random" ? g_CivData[civ].Name : "Random");
pCivText.caption = g_CivData[civ].Name;
pTeamText.caption = (team !== undefined && team >= 0) ? team+1 : "-";
}
else if (g_GameAttributes.mapType == "random")

1
binaries/data/mods/public/gui/gamesetup/gamesetup.xml
View File

@ -86,6 +86,7 @@
<object size="10.9% 363 28% 423" name="mapFilterSelectionTooltip">
<object name="mapTypeText" type="text" style="LeftLabelText" size="0 0 100% 28" hidden="true"/>
<object name="mapFilterText" type="text" style="LeftLabelText" size="0 32 100% 60" hidden="true"/>
<object name="mapSelectionText" type="text" style="LeftLabelText" size="0 64 100% 82" hidden="true"/>
</object>
<object name="mapTypeSelection"