Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/ExploredMap.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/ExploredMap.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/ExploredMap.js
@@ -2,10 +2,11 @@
 {
 	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)
 		{
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/LastManStanding.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/LastManStanding.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/LastManStanding.js
@@ -2,11 +2,12 @@
 {
 	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)
 		{
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/LockedTeams.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/LockedTeams.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/LockedTeams.js
@@ -2,11 +2,12 @@
 {
 	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)
 		{
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Nomad.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Nomad.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Nomad.js
@@ -7,10 +7,11 @@
 		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)
 		{
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/RegicideGarrison.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/RegicideGarrison.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/RegicideGarrison.js
@@ -4,12 +4,13 @@
 	{
 		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;
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/RevealedMap.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/RevealedMap.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/RevealedMap.js
@@ -2,10 +2,11 @@
 {
 	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)
 		{
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Spies.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Spies.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Spies.js
@@ -2,10 +2,11 @@
 {
 	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)
 		{
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Treasures.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Treasures.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Treasures.js
@@ -2,10 +2,11 @@
 {
 	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)
 		{
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/WorldPopulation.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/WorldPopulation.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/WorldPopulation.js
@@ -2,10 +2,11 @@
 {
 	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)
 		{
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/GameSpeed.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/GameSpeed.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/GameSpeed.js
@@ -9,7 +9,9 @@
 
 	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;
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSize.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSize.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSize.js
@@ -17,10 +17,11 @@
 
 	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)
 		{
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/PopulationCap.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/PopulationCap.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/PopulationCap.js
@@ -14,10 +14,11 @@
 
 	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)
 		{
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/StartingResources.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/StartingResources.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/StartingResources.js
@@ -24,10 +24,11 @@
 
 	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)
 		{
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/WorldPopulationCap.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/WorldPopulationCap.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/WorldPopulationCap.js
@@ -12,10 +12,11 @@
 
 	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)
 		{
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/Ceasefire.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/Ceasefire.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/Ceasefire.js
@@ -9,10 +9,11 @@
 
 	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)
 		{
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/RelicCount.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/RelicCount.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/RelicCount.js
@@ -12,12 +12,13 @@
 	{
 		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;
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/RelicDuration.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/RelicDuration.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/RelicDuration.js
@@ -12,12 +12,13 @@
 	{
 		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;
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/WonderDuration.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/WonderDuration.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/WonderDuration.js
@@ -12,12 +12,13 @@
 	{
 		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;