gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Read correctly 0/false values from map files in gamesetup

Browse Source 
After 34138a7764, if map specifies 0 as value in certain settings, this
value is ignored.
Fixing that by explicitly checking for undefined.

Differential Revision: D2982
Reviewed by: Freagarach
This was SVN commit r24037.
This commit is contained in:
Angen
2020-09-11 19:24:02 +00:00
parent 277fb13ba0
commit fdafaf2926
18 changed files with 73 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/ExploredMap.js
+4 -3
View File
@@ -2,10 +2,11 @@ GameSettingControls.ExploredMap = class extends GameSettingControlCheckbox
{
onMapChange(mapData)
{
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
mapData.settings.ExploreMap || undefined;
mapData.settings.ExploreMap !== undefined)
mapValue = mapData.settings.ExploreMap;
if (mapValue !== undefined && mapValue != g_GameAttributes.settings.ExploreMap)
{
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/LastManStanding.js
+5 -4
View File
@@ -2,11 +2,12 @@ GameSettingControls.LastManStanding = class extends GameSettingControlCheckbox
{
onMapChange(mapData)
{
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
!mapData.settings.LockTeams &&
mapData.settings.LastManStanding;
mapData.settings.LastManStanding !== undefined)
mapValue = !mapData.settings.LockTeams &&
mapData.settings.LastManStanding;
if (mapValue !== undefined && mapValue != g_GameAttributes.settings.LastManStanding)
{
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/LockedTeams.js
+5 -4
View File
@@ -2,11 +2,12 @@ GameSettingControls.LockedTeams = class extends GameSettingControlCheckbox
{
onMapChange(mapData)
{
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
!mapData.settings.LockTeams &&
mapData.settings.LastManStanding;
mapData.settings.LockTeams !== undefined)
mapValue = !mapData.settings.LockTeams &&
mapData.settings.LastManStanding;
if (mapValue !== undefined && mapValue != g_GameAttributes.settings.LastManStanding)
{
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Nomad.js
+4 -3
View File
@@ -7,10 +7,11 @@ GameSettingControls.Nomad = class extends GameSettingControlCheckbox
if (!available)
return;
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
mapData.settings.Nomad;
mapData.settings.Nomad !== undefined)
mapValue = mapData.settings.Nomad;
if (mapValue !== undefined && mapValue != g_GameAttributes.settings.Nomad)
{
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/RegicideGarrison.js
+4 -3
View File
@@ -4,12 +4,13 @@ GameSettingControls.RegicideGarrison = class extends GameSettingControlCheckbox
{
this.setEnabled(g_GameAttributes.mapType != "scenario");
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
mapData.settings.VictoryConditions &&
mapData.settings.VictoryConditions.indexOf(this.RegicideName) != -1 &&
mapData.settings.RegicideGarrison;
mapData.settings.RegicideGarrison !== undefined)
mapValue = mapData.settings.RegicideGarrison;
if (mapValue !== undefined || !g_GameAttributes.settings || mapValue == g_GameAttributes.settings.RegicideGarrison)
return;
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/RevealedMap.js
+4 -3
View File
@@ -2,10 +2,11 @@ GameSettingControls.RevealedMap = class extends GameSettingControlCheckbox
{
onMapChange(mapData)
{
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
mapData.settings.RevealMap || undefined;
mapData.settings.RevealMap !== undefined)
mapValue = mapData.settings.RevealMap;
if (mapValue !== undefined && mapValue != g_GameAttributes.settings.RevealMap)
{
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Spies.js
+4 -3
View File
@@ -2,10 +2,11 @@ GameSettingControls.Spies = class extends GameSettingControlCheckbox
{
onMapChange(mapData)
{
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
mapData.settings.DisableSpies;
mapData.settings.DisableSpies !== undefined)
mapValue = mapData.settings.DisableSpies;
if (mapValue !== undefined && mapValue != g_GameAttributes.settings.DisableSpies)
{
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Treasures.js
+4 -3
View File
@@ -2,10 +2,11 @@ GameSettingControls.Treasures = class extends GameSettingControlCheckbox
{
onMapChange(mapData)
{
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
mapData.settings.DisableTreasures;
mapData.settings.DisableTreasures !== undefined)
mapValue = mapData.settings.DisableTreasures;
if (mapValue !== undefined && mapValue != g_GameAttributes.settings.DisableTreasures)
{
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/WorldPopulation.js
+4 -3
View File
@@ -2,10 +2,11 @@ GameSettingControls.WorldPopulation = class extends GameSettingControlCheckbox
{
onMapChange(mapData)
{
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
mapData.settings.WorldPopulation || undefined;
mapData.settings.WorldPopulation !== undefined)
mapValue = mapData.settings.WorldPopulation;
if (mapValue !== undefined && mapValue != g_GameAttributes.settings.WorldPopulation)
{
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/GameSpeed.js
+3 -1
View File
@@ -9,7 +9,9 @@ GameSettingControls.GameSpeed = class extends GameSettingControlDropdown
onMapChange(mapData)
{
let mapValue = mapData && mapData.gameSpeed || undefined;
let mapValue;
if (mapData && mapData.gameSpeed !== undefined)
mapValue = mapData.gameSpeed;
if (mapValue !== undefined && mapValue != g_GameAttributes.gameSpeed)
{
g_GameAttributes.gameSpeed = mapValue;
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSize.js
+4 -3
View File
@@ -17,10 +17,11 @@ GameSettingControls.MapSize = class extends GameSettingControlDropdown
onMapChange(mapData)
{
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
mapData.settings.Size || undefined;
mapData.settings.Size !== undefined)
mapValue = mapData.settings.Size;
if (g_GameAttributes.mapType == "random" && mapValue !== undefined && mapValue != g_GameAttributes.settings.Size)
{
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/PopulationCap.js
+4 -3
View File
@@ -14,10 +14,11 @@ GameSettingControls.PopulationCap = class extends GameSettingControlDropdown
onMapChange(mapData)
{
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
mapData.settings.PopulationCap || undefined;
mapData.settings.PopulationCap !== undefined)
mapValue = mapData.settings.PopulationCap;
if (mapValue !== undefined && mapValue != g_GameAttributes.settings.PopulationCap)
{
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/StartingResources.js
+4 -3
View File
@@ -24,10 +24,11 @@ GameSettingControls.StartingResources = class extends GameSettingControlDropdown
onMapChange(mapData)
{
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
mapData.settings.StartingResources || undefined;
mapData.settings.StartingResources !== undefined)
mapValue = mapData.settings.StartingResources;
if (mapValue !== undefined && mapValue != g_GameAttributes.settings.StartingResources)
{
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/WorldPopulationCap.js
+4 -3
View File
@@ -12,10 +12,11 @@ GameSettingControls.WorldPopulationCap = class extends GameSettingControlDropdow
onMapChange(mapData)
{
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
mapData.settings.WorldPopulationCap || undefined;
mapData.settings.WorldPopulationCap !== undefined)
mapValue = mapData.settings.WorldPopulationCap;
if (mapValue !== undefined && mapValue != g_GameAttributes.settings.WorldPopulationCap)
{
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/Ceasefire.js
+4 -3
View File
@@ -9,10 +9,11 @@ GameSettingControls.Ceasefire = class extends GameSettingControlSlider
onMapChange(mapData)
{
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
mapData.settings.Ceasefire || undefined;
mapData.settings.Ceasefire !== undefined)
mapValue = mapData.settings.Ceasefire;
if (mapValue !== undefined && mapValue != g_GameAttributes.settings.Ceasefire)
{
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/RelicCount.js
+4 -3
View File
@@ -12,12 +12,13 @@ GameSettingControls.RelicCount = class extends GameSettingControlSlider
{
this.setEnabled(g_GameAttributes.mapType != "scenario");
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
mapData.settings.VictoryConditions &&
mapData.settings.VictoryConditions.indexOf(this.NameCaptureTheRelic) != -1 &&
mapData.settings.RelicCount || undefined;
mapData.settings.RelicCount !== undefined)
mapValue = mapData.settings.RelicCount;
if (mapValue === undefined || mapValue == g_GameAttributes.settings.RelicCount)
return;
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/RelicDuration.js
+4 -3
View File
@@ -12,12 +12,13 @@ GameSettingControls.RelicDuration = class extends GameSettingControlSlider
{
this.setEnabled(g_GameAttributes.mapType != "scenario");
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
mapData.settings.VictoryConditions &&
mapData.settings.VictoryConditions.indexOf(this.NameCaptureTheRelic) != -1 &&
mapData.settings.RelicDuration || undefined;
mapData.settings.RelicDuration !== undefined)
mapValue = mapData.settings.RelicDuration;
if (mapValue === undefined || mapValue == g_GameAttributes.settings.RelicDuration)
return;
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/WonderDuration.js
+4 -3
View File
@@ -12,12 +12,13 @@ GameSettingControls.WonderDuration = class extends GameSettingControlSlider
{
this.setEnabled(g_GameAttributes.mapType != "scenario");
let mapValue =
mapData &&
let mapValue;
if (mapData &&
mapData.settings &&
mapData.settings.VictoryConditions &&
mapData.settings.VictoryConditions.indexOf(this.NameWonderVictory) != -1 &&
mapData.settings.WonderDuration || undefined;
mapData.settings.WonderDuration !== undefined)
mapValue = mapData.settings.WonderDuration;
if (mapValue === undefined || mapValue == g_GameAttributes.settings.WonderDuration)
return;