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

Hide map size for skirmish and scenarios. Refs #2301.

Browse Source 
Also fix my previous commit because obviously I had committed the wrong
default value.

This was SVN commit r14448.
This commit is contained in:
wraitii 2013-12-30 15:59:00 +00:00
parent 08b44fe647
commit ddee36e0a8
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binaries/data/config/default.cfg
View File

@ -44,7 +44,7 @@ bpp = 0
; System settings: ; System settings:
; if false, actors won't be rendered but anything entity will be. ; if false, actors won't be rendered but anything entity will be.
renderactors = false renderactors = true
waternormals = true waternormals = true
waterrealdepth = true waterrealdepth = true

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

@ -932,6 +932,7 @@ function onGameAttributesChange()
var startingResources = getGUIObjectByName("startingResources"); var startingResources = getGUIObjectByName("startingResources");
var numPlayersText= getGUIObjectByName("numPlayersText"); var numPlayersText= getGUIObjectByName("numPlayersText");
var mapSizeDesc = getGUIObjectByName("mapSizeDesc");
var mapSizeText = getGUIObjectByName("mapSizeText"); var mapSizeText = getGUIObjectByName("mapSizeText");
var revealMapText = getGUIObjectByName("revealMapText"); var revealMapText = getGUIObjectByName("revealMapText");
var victoryConditionText = getGUIObjectByName("victoryConditionText"); var victoryConditionText = getGUIObjectByName("victoryConditionText");
@ -959,6 +960,7 @@ function onGameAttributesChange()
switch (g_GameAttributes.mapType) switch (g_GameAttributes.mapType)
{ {
case "random": case "random":
mapSizeDesc.hidden = false;
if (g_IsController) if (g_IsController)
{ {
//Host //Host
@ -1016,6 +1018,8 @@ function onGameAttributesChange()
numPlayersText.caption = numPlayers; numPlayersText.caption = numPlayers;
numPlayersSelection.hidden = true; numPlayersSelection.hidden = true;
mapSize.hidden = true; mapSize.hidden = true;
mapSizeText.hidden = true;
mapSizeDesc.hidden = true;
if (g_IsController) if (g_IsController)
{ {
//Host //Host
@ -1026,7 +1030,6 @@ function onGameAttributesChange()
startingResources.hidden = false; startingResources.hidden = false;
numPlayersText.hidden = false; numPlayersText.hidden = false;
mapSizeText.hidden = false;
revealMapText.hidden = true; revealMapText.hidden = true;
victoryConditionText.hidden = true; victoryConditionText.hidden = true;
lockTeamsText.hidden = true; lockTeamsText.hidden = true;
@ -1045,7 +1048,6 @@ function onGameAttributesChange()
{ {
// Client // Client
numPlayersText.hidden = false; numPlayersText.hidden = false;
mapSizeText.hidden = false;
revealMapText.hidden = false; revealMapText.hidden = false;
victoryConditionText.hidden = false; victoryConditionText.hidden = false;
lockTeamsText.hidden = false; lockTeamsText.hidden = false;
@ -1070,7 +1072,8 @@ function onGameAttributesChange()
victoryCondition.hidden = true; victoryCondition.hidden = true;
lockTeams.hidden = true; lockTeams.hidden = true;
numPlayersText.hidden = false; numPlayersText.hidden = false;
mapSizeText.hidden = false; mapSizeText.hidden = true;
mapSizeDesc.hidden = true;
revealMapText.hidden = false; revealMapText.hidden = false;
victoryConditionText.hidden = false; victoryConditionText.hidden = false;
lockTeamsText.hidden = false; lockTeamsText.hidden = false;

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

@ -103,7 +103,7 @@
<object type="text" style="RightLabelText" size="0 0 100% 30">Match Type:</object> <object type="text" style="RightLabelText" size="0 0 100% 30">Match Type:</object>
<object type="text" style="RightLabelText" size="0 32 100% 62">Map Filter:</object> <object type="text" style="RightLabelText" size="0 32 100% 62">Map Filter:</object>
<object type="text" style="RightLabelText" size="0 64 100% 94">Select Map:</object> <object type="text" style="RightLabelText" size="0 64 100% 94">Select Map:</object>
<object type="text" style="RightLabelText" size="0 96 100% 126">Map Size:</object> <object name="mapSizeDesc" type="text" style="RightLabelText" size="0 96 100% 126">Map Size:</object>
</object> </object>
<object size="100%-327 363 100%-25 423" name="mapFilterSelectionTooltip"> <object size="100%-327 363 100%-25 423" name="mapFilterSelectionTooltip">