From 71b0d9c052ac617eee92f3e593bdb1eda9e84126 Mon Sep 17 00:00:00 2001 From: elexis Date: Fri, 4 Dec 2015 16:37:30 +0000 Subject: [PATCH] Update atlas with the new map_sizes.json format. Refs #3355. This was SVN commit r17379. --- source/simulation2/Simulation2.cpp | 2 +- source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp | 2 +- .../atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/simulation2/Simulation2.cpp b/source/simulation2/Simulation2.cpp index 3cdc6cbe9b..f868dc9ae6 100644 --- a/source/simulation2/Simulation2.cpp +++ b/source/simulation2/Simulation2.cpp @@ -886,7 +886,7 @@ std::string CSimulation2::GetPlayerDefaults() std::string CSimulation2::GetMapSizes() { - return ReadJSON(L"simulation/data/map_sizes.json"); + return ReadJSON(L"simulation/data/settings/map_sizes.json"); } std::string CSimulation2::GetAIData() diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp index 16ebd68ca4..5045b084f3 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp @@ -373,7 +373,7 @@ void MapSidebar::OnFirstDisplay() qrySizes.Post(); AtObj sizes = AtlasObject::LoadFromJSON(*qrySizes.sizes); wxChoice* sizeChoice = wxDynamicCast(FindWindow(ID_RandomSize), wxChoice); - for (AtIter s = sizes["Sizes"]["item"]; s.defined(); ++s) + for (AtIter s = sizes["Data"]["item"]; s.defined(); ++s) { long tiles = 0; wxString(s["Tiles"]).ToLong(&tiles); diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp index f31047da37..2c2287aef7 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp @@ -286,7 +286,7 @@ void TerrainSidebar::OnResizeMap(wxCommandEvent& WXUNUSED(evt)) AtlasMessage::qGetMapSizes qrySizes; qrySizes.Post(); AtObj sizes = AtlasObject::LoadFromJSON(*qrySizes.sizes); - for (AtIter s = sizes["Sizes"]["item"]; s.defined(); ++s) + for (AtIter s = sizes["Data"]["item"]; s.defined(); ++s) { long tiles = 0; wxString(s["Tiles"]).ToLong(&tiles);