Cayleb-Ordo/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Update atlas with the new map_sizes.json format. Refs #3355.

Browse Source 
This was SVN commit r17379.
This commit is contained in:
elexis 2015-12-04 16:37:30 +00:00
parent 6572b6d042
commit 71b0d9c052
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/simulation2/Simulation2.cpp
View File

@ -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()

2
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp
View File

@ -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);

2
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
View File

@ -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);