Przeglądaj źródła

Use object instead of array

Daniele Bartolini 10 lat temu
rodzic
commit
fd5db18ce7
1 zmienionych plików z 6 dodań i 4 usunięć
  1. 6 4
      src/resource/level_resource.cpp

+ 6 - 4
src/resource/level_resource.cpp

@@ -25,13 +25,15 @@ namespace level_resource
 
 
 		Array<LevelSound> sounds(default_allocator());
 		Array<LevelSound> sounds(default_allocator());
 		{
 		{
-			JsonArray sounds_json(ta);
-			sjson::parse_array(object["sounds"], sounds_json);
+			JsonObject sounds_json(ta);
+			sjson::parse_object(object["sounds"], sounds_json);
 
 
-			for (u32 i = 0, n = array::size(sounds_json); i < n; ++i)
+			auto begin = map::begin(sounds_json);
+			auto end = map::end(sounds_json);
+			for (; begin != end; ++begin)
 			{
 			{
 				JsonObject sound(ta);
 				JsonObject sound(ta);
-				sjson::parse_object(sounds_json[i], sound);
+				sjson::parse_object(begin->pair.second, sound);
 
 
 				LevelSound ls;
 				LevelSound ls;
 				ls.name     = sjson::parse_resource_id(sound["name"]);
 				ls.name     = sjson::parse_resource_id(sound["name"]);