Update atlas with the new map_sizes.json format. Refs #3355.
This was SVN commit r17379.
This commit is contained in:
parent
6572b6d042
commit
71b0d9c052
@ -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()
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user