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

Minor tweaks to game setup layout: options are now properly aligned and "locked teams" defaults to yes (which is what they are). Fix team indices on one map.

Browse Source 
This was SVN commit r8809.
This commit is contained in:
historic_bruno 2010-12-08 06:19:34 +00:00
parent 76ac9e7f84
commit e710fd25b4
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -636,18 +636,18 @@ function onGameAttributesChange()
mapSizeText.caption = "Map size:";
mapSize.selected = sizeIdx;
revealMapText.caption = "Reveal map:";
revealMap.checked = g_GameAttributes.settings.RevealMap ? true : false;
revealMap.checked = (g_GameAttributes.settings.RevealMap ? true : false);
victoryConditionText.caption = "Victory condition:";
victoryCondition.selected = victoryCondition.list_data.indexOf(g_GameAttributes.settings.GameType);
lockTeamsText.caption = "Teams locked:";
lockTeams.checked = g_GameAttributes.settings.LockTeams ? true : false;
lockTeams.checked = (g_GameAttributes.settings.LockTeams === undefined || g_GameAttributes.settings.LockTeams ? true : false);
}
else
{
mapSizeText.caption = "Map size: " + (mapSize.list[sizeIdx] !== undefined ? mapSize.list[sizeIdx] : "n/a");
mapSizeText.caption = "Map size: " + (mapSize.list[sizeIdx] !== undefined ? mapSize.list[sizeIdx] : "Default");
revealMapText.caption = "Reveal map: " + (g_GameAttributes.settings.RevealMap ? "Yes" : "No");
victoryConditionText.caption = "Victory condition: " + (g_GameAttributes.settings.GameType && g_GameAttributes.settings.GameType == "endless" ? "None" : "Conquest");
lockTeamsText.caption = "Teams locked: " + (g_GameAttributes.settings.LockTeams ? "Yes" : "No");
lockTeamsText.caption = "Teams locked: " + (g_GameAttributes.settings.LockTeams === undefined || g_GameAttributes.settings.LockTeams ? "Yes" : "No");
}
break;
@ -661,10 +661,10 @@ function onGameAttributesChange()
victoryCondition.hidden = true;
lockTeams.hidden = true;
mapSizeText.caption = "Map size: n/a";
mapSizeText.caption = "Map size: Default";
revealMapText.caption = "Reveal map: " + (mapSettings.RevealMap ? "Yes" : "No");
victoryConditionText.caption = "Victory condition: " + (mapSettings.GameType && mapSettings.GameType == "endless" ? "None" : "Conquest");
lockTeamsText.caption = "Teams locked: " + (mapSettings.LockTeams ? "Yes" : "No");
lockTeamsText.caption = "Teams locked: " + (mapSettings.LockTeams === undefined || mapSettings.LockTeams ? "Yes" : "No");
break;

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

@ -117,15 +117,15 @@
<object name="gameOptionsBox" size="260 100%-260 100% 100%-190">
<object size="2 2 100% 50%-2"> <!-- Top row -->
<object name="mapSizeText" size="0 0 175 100%" type="text">Map size: n/a</object>
<object name="mapSizeText" size="0 0 175 100%" type="text">Map size:</object>
<object name="mapSize" size="75 -2 175 100%-6" type="dropdown" style="wheatDropDown" hidden="true"/>
<object name="victoryConditionText" size="195 0 450 100%" type="text">Victory condition: </object>
<object name="victoryConditionText" size="195 0 450 100%" type="text">Victory condition:</object>
<object name="victoryCondition" size="325 -2 450 100%-6" type="dropdown" style="wheatDropDown" hidden="true"/>
</object>
<object size="2 50%+2 100% 100%"> <!-- Bottom row -->
<object name="revealMapText" size="0 0 120 100%" type="text">Reveal map: </object>
<object name="revealMapText" size="0 0 120 100%" type="text">Reveal map:</object>
<object name="revealMap" size="100 2 120 100%" type="checkbox" style="wheatCrossBox" hidden="true"/>
<object name="lockTeamsText" size="140 0 280 100%" type="text">Teams locked: </object>
<object name="lockTeamsText" size="195 0 450 100%" type="text">Teams locked:</object>
<object name="lockTeams" size="260 2 280 100%" type="checkbox" style="wheatCrossBox" hidden="true"/>
</object>
</object>

BIN
binaries/data/mods/public/maps/scenarios/Saharan Oases.xml (Stored with Git LFS)
View File

Binary file not shown.