From 60f784900a7a9318f9f0271b40fd154902d7ccec Mon Sep 17 00:00:00 2001 From: sanderd17 Date: Tue, 26 May 2015 14:25:23 +0000 Subject: [PATCH] Fix the territory influence weight to fit into an u16 number. (no idea why the buildings have so many different weights though). This was SVN commit r16682. --- .../simulation/templates/campaigns/campaign_religious_test.xml | 2 +- .../public/simulation/templates/other/hellenic_epic_temple.xml | 2 +- .../public/simulation/templates/other/hellenic_propylaea.xml | 2 +- .../public/simulation/templates/other/hellenic_royal_stoa.xml | 2 +- .../mods/public/simulation/templates/other/hellenic_stoa.xml | 2 +- .../data/mods/public/simulation/templates/other/maur_palace.xml | 2 +- .../mods/public/simulation/templates/structures/brit_house.xml | 2 +- .../mods/public/simulation/templates/structures/gaul_house.xml | 2 +- .../mods/public/simulation/templates/structures/gaul_tavern.xml | 2 +- .../mods/public/simulation/templates/structures/iber_house.xml | 2 +- .../simulation/templates/template_structure_defense_wall.xml | 2 +- .../templates/template_structure_defense_wall_gate.xml | 2 +- .../templates/template_structure_defense_wall_tower.xml | 2 +- .../public/simulation/templates/template_structure_wonder.xml | 2 +- source/simulation2/components/CCmpTerritoryInfluence.cpp | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/binaries/data/mods/public/simulation/templates/campaigns/campaign_religious_test.xml b/binaries/data/mods/public/simulation/templates/campaigns/campaign_religious_test.xml index 51d657b5ea..65b584ba41 100644 --- a/binaries/data/mods/public/simulation/templates/campaigns/campaign_religious_test.xml +++ b/binaries/data/mods/public/simulation/templates/campaigns/campaign_religious_test.xml @@ -18,7 +18,7 @@ true 100 - 65536 + 65535 diff --git a/binaries/data/mods/public/simulation/templates/other/hellenic_epic_temple.xml b/binaries/data/mods/public/simulation/templates/other/hellenic_epic_temple.xml index 29d786d2e6..a67e116940 100644 --- a/binaries/data/mods/public/simulation/templates/other/hellenic_epic_temple.xml +++ b/binaries/data/mods/public/simulation/templates/other/hellenic_epic_temple.xml @@ -44,7 +44,7 @@ 60 - 65536 + 65535 80 diff --git a/binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml b/binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml index 2f1b9ccb61..9b8519e50e 100644 --- a/binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml +++ b/binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml @@ -41,7 +41,7 @@ false 40 - 65536 + 65535 20 diff --git a/binaries/data/mods/public/simulation/templates/other/hellenic_royal_stoa.xml b/binaries/data/mods/public/simulation/templates/other/hellenic_royal_stoa.xml index 1e39b91ec2..322e8ac700 100644 --- a/binaries/data/mods/public/simulation/templates/other/hellenic_royal_stoa.xml +++ b/binaries/data/mods/public/simulation/templates/other/hellenic_royal_stoa.xml @@ -46,7 +46,7 @@ false 40 - 65536 + 65535 0.7 diff --git a/binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml b/binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml index ec6329db21..d88e1341fb 100644 --- a/binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml +++ b/binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml @@ -42,7 +42,7 @@ false 36 - 65536 + 65535 40 diff --git a/binaries/data/mods/public/simulation/templates/other/maur_palace.xml b/binaries/data/mods/public/simulation/templates/other/maur_palace.xml index 22560f52e6..8344d4dcf6 100644 --- a/binaries/data/mods/public/simulation/templates/other/maur_palace.xml +++ b/binaries/data/mods/public/simulation/templates/other/maur_palace.xml @@ -30,7 +30,7 @@ false 38 - 65536 + 65535 structures/mauryans/misc_structure_01.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_house.xml b/binaries/data/mods/public/simulation/templates/structures/brit_house.xml index 7b441de38f..f33bbfdb0c 100644 --- a/binaries/data/mods/public/simulation/templates/structures/brit_house.xml +++ b/binaries/data/mods/public/simulation/templates/structures/brit_house.xml @@ -14,7 +14,7 @@ 16 - 65536 + 65535 structures/britons/house.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_house.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_house.xml index 464fcbf0bc..17e81304c3 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul_house.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul_house.xml @@ -14,7 +14,7 @@ 16 - 65536 + 65535 structures/gauls/house.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml index ca25c7198e..2e21d87b18 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml @@ -33,7 +33,7 @@ 32 - 65536 + 65535 0.7 diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_house.xml b/binaries/data/mods/public/simulation/templates/structures/iber_house.xml index 6ca758a3d6..b616f86bcb 100644 --- a/binaries/data/mods/public/simulation/templates/structures/iber_house.xml +++ b/binaries/data/mods/public/simulation/templates/structures/iber_house.xml @@ -17,7 +17,7 @@ 16 - 65536 + 65535 structures/iberians/house.xml diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml index 18314fe31f..2f0887096b 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml @@ -47,7 +47,7 @@ false 20 - 65536 + 65535 20 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml index 121b99afb6..a9076b583b 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml @@ -60,7 +60,7 @@ false 20 - 65536 + 65535 structures/fndn_wall.xml diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml index 999e6cb3c3..e5c8dff067 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml @@ -84,7 +84,7 @@ false 20 - 65536 + 65535 60 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml index c403f0c793..a25cdde218 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml @@ -76,7 +76,7 @@ true 100 - 65536 + 65535 72 diff --git a/source/simulation2/components/CCmpTerritoryInfluence.cpp b/source/simulation2/components/CCmpTerritoryInfluence.cpp index a41588b76e..0ba9a04dc6 100644 --- a/source/simulation2/components/CCmpTerritoryInfluence.cpp +++ b/source/simulation2/components/CCmpTerritoryInfluence.cpp @@ -45,7 +45,7 @@ public: "" "" "" - "65536" // Max value 2^16 + "65535" // Max u16 value "" "" ""