dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Gamesetup cleanup. Patch by Imarok, fixes #3980.

Browse source 
Rename GUI objects to numPlayers, mapFilter and mapType for consistency.
Thus use loops to remove code duplication for hiding controls.

This was SVN commit r18169.
This commit is contained in:
elexis 2016-05-14 12:07:41 +00:00
parent 721c47a9e8
commit f5cfda84b8
2 changed files with 25 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
binaries/data/mods/public/gui/gamesetup/gamesetup.js
View file

@ -281,7 +281,7 @@ function initGUIObjects()
function initMapTypes()
{
let mapTypes = Engine.GetGUIObjectByName("mapTypeSelection");
let mapTypes = Engine.GetGUIObjectByName("mapType");
mapTypes.list = g_MapTypes.Title;
mapTypes.list_data = g_MapTypes.Name;
mapTypes.onSelectionChange = function() {
@ -294,7 +294,7 @@ function initMapTypes()
function initMapFilters()
{
let mapFilters = Engine.GetGUIObjectByName("mapFilterSelection");
let mapFilters = Engine.GetGUIObjectByName("mapFilter");
mapFilters.list = g_MapFilters.map(mapFilter => mapFilter.name);
mapFilters.list_data = g_MapFilters.map(mapFilter => mapFilter.id);
mapFilters.onSelectionChange = function() {
@ -355,14 +355,14 @@ function resizeMoreOptionsWindow()
function initNumberOfPlayers()
{
let playersArray = Array(g_MaxPlayers).fill(0).map((v, i) => i + 1); // 1, 2, ..., MaxPlayers
let numPlayersSelection = Engine.GetGUIObjectByName("numPlayersSelection");
numPlayersSelection.list = playersArray;
numPlayersSelection.list_data = playersArray;
numPlayersSelection.onSelectionChange = function() {
let numPlayers = Engine.GetGUIObjectByName("numPlayers");
numPlayers.list = playersArray;
numPlayers.list_data = playersArray;
numPlayers.onSelectionChange = function() {
if (this.selected != -1)
selectNumPlayers(this.list_data[this.selected]);
};
numPlayersSelection.selected = g_MaxPlayers - 1;
numPlayers.selected = g_MaxPlayers - 1;
}
function initGameSpeed()
@ -502,12 +502,8 @@ function initRadioButtons()
*/
function hideControls()
{
hideControl("mapTypeSelection", "mapTypeText");
hideControl("mapFilterSelection", "mapFilterText");
hideControl("mapSelection", "mapSelectionText");
hideControl("victoryCondition", "victoryConditionText");
hideControl("gameSpeed", "gameSpeedText");
hideControl("numPlayersSelection", "numPlayersText");
for (let ctrl of ["mapType", "mapFilter", "mapSelection", "victoryCondition", "gameSpeed", "numPlayers"])
hideControl(ctrl, ctrl + "Text");
// TODO: Shouldn't players be able to choose their own assignment?
for (let i = 0; i < g_MaxPlayers; ++i)
@ -561,8 +557,8 @@ function initMultiplayerSettings()
Engine.GetGUIObjectByName("enableCheats").checked = g_GameAttributes.settings.CheatsEnabled;
Engine.GetGUIObjectByName("enableRating").checked = !!g_GameAttributes.settings.RatingEnabled;
hideControl("enableCheats", "enableCheatsText");
hideControl("enableRating", "enableRatingText");
for (let ctrl of ["enableCheats", "enableRating"])
hideControl(ctrl, ctrl + "Text");
}
/**
@ -1304,11 +1300,11 @@ function updateGUIObjects()
if (g_IsController)
{
Engine.GetGUIObjectByName("mapTypeSelection").selected = mapTypeIdx;
Engine.GetGUIObjectByName("mapFilterSelection").selected = mapFilterIdx;
Engine.GetGUIObjectByName("mapType").selected = mapTypeIdx;
Engine.GetGUIObjectByName("mapFilter").selected = mapFilterIdx;
Engine.GetGUIObjectByName("mapSelection").selected = Engine.GetGUIObjectByName("mapSelection").list_data.indexOf(mapName);
Engine.GetGUIObjectByName("mapSize").selected = mapSizeIdx;
Engine.GetGUIObjectByName("numPlayersSelection").selected = numPlayers - 1;
Engine.GetGUIObjectByName("numPlayers").selected = numPlayers - 1;
Engine.GetGUIObjectByName("victoryCondition").selected = victoryIdx;
Engine.GetGUIObjectByName("wonderDuration").selected = wonderDurationIdx;
Engine.GetGUIObjectByName("populationCap").selected = popIdx;
@ -1355,18 +1351,14 @@ function updateGUIObjects()
Engine.GetGUIObjectByName("mapSizeDesc").hidden = !isRandom;
Engine.GetGUIObjectByName("mapSize").hidden = !isRandom || !g_IsController;
Engine.GetGUIObjectByName("mapSizeText").hidden = !isRandom || g_IsController;
hideControl("numPlayersSelection", "numPlayersText", isRandom && g_IsController);
hideControl("numPlayers", "numPlayersText", isRandom && g_IsController);
let notScenario = g_GameAttributes.mapType != "scenario" && g_IsController ;
hideControl("victoryCondition", "victoryConditionText", notScenario);
hideControl("wonderDuration", "wonderDurationText", notScenario);
hideControl("populationCap", "populationCapText", notScenario);
hideControl("startingResources", "startingResourcesText", notScenario);
hideControl("ceasefire", "ceasefireText", notScenario);
hideControl("revealMap", "revealMapText", notScenario);
hideControl("exploreMap", "exploreMapText", notScenario);
hideControl("disableTreasures", "disableTreasuresText", notScenario);
hideControl("lockTeams", "lockTeamsText", notScenario);
for (let ctrl of ["victoryCondition", "wonderDuration", "populationCap",
"startingResources", "ceasefire", "revealMap",
"exploreMap", "disableTreasures", "lockTeams"])
hideControl(ctlr, ctrl + "Text", notScenario);
setMapDescription();

10
binaries/data/mods/public/gui/gamesetup/gamesetup.xml
View file

@ -105,7 +105,7 @@
<object size="24 64 100%-460 358" type="image" sprite="CoverFillDark" name="playerAssignmentsPanelCover" hidden="true"/>
<!-- Map selection -->
<object size="100%-425 355 100%-285 470" name="mapTypeSelectionTooltip">
<object size="100%-425 355 100%-285 470" name="mapTypeTooltip">
<object type="text" style="ModernRightLabelText" size="0 0 100% 30">
<translatableAttribute id="caption">Map Type:</translatableAttribute>
</object>
@ -124,14 +124,14 @@
</object>
<object size="100%-275 355 100%-25 470" name="mapFilterSelectionTooltip">
<object size="100%-275 355 100%-25 470" name="mapFilterTooltip">
<object name="mapTypeText" type="text" style="ModernLeftLabelText" size="0 0 100% 30" hidden="true"/>
<object name="mapFilterText" type="text" style="ModernLeftLabelText" size="0 32 100% 62" hidden="true"/>
<object name="mapSelectionText" type="text" style="ModernLeftLabelText" size="0 64 100% 94" hidden="true"/>
<object name="mapSizeText" type="text" style="ModernLeftLabelText" size="0 128 100% 158" hidden="true"/>
</object>
<object name="mapTypeSelection"
<object name="mapType"
type="dropdown"
style="ModernDropDown"
size="100%-275 355 100%-25 383"
@ -139,7 +139,7 @@
<translatableAttribute id="tooltip">Select a map type.</translatableAttribute>
</object>
<object name="mapFilterSelection"
<object name="mapFilter"
type="dropdown"
style="ModernDropDown"
size="100%-275 387 100%-25 415"
@ -158,7 +158,7 @@
</object>
<object name="numPlayersText" size="100%-275 451 100%-25 483" type="text" style="ModernLeftLabelText"/>
<object name="numPlayersSelection"
<object name="numPlayers"
type="dropdown"
style="ModernDropDown"
size="100%-275 451 100%-25 479"