Merge pull request #1105 from krs0/feature/#1071__In_latest_night_builds_there_are_problems_with_schema_obstacle.json_and_file_obstacles.json

Problems with schema obstacle.json and file obstacles.json #1071

config/schemas/obstacle.json

@@ -15,7 +15,7 @@
 		"specialBattlefields": {
 			"type": "array",
 			"description": "Obstacles can be placed on specified specified battlefields",
-			"items": { "$ref" : "battlefield.json" }
+			"items": { "type" : "string" }
 		},
 		"width": {
 			"type": "number",

lib/ObstacleHandler.cpp

@@ -85,7 +85,7 @@ ObstacleInfo * ObstacleHandler::loadFromJson(const std::string & scope, const Js
 	info->animation = json["animation"].String();
 	info->width = json["width"].Integer();
 	info->height = json["height"].Integer();
-	for(auto & t : json["allowedTerrain"].Vector())
+	for(auto & t : json["allowedTerrains"].Vector())
 		info->allowedTerrains.emplace_back(VLC->terrainTypeHandler->getInfoByName(t.String())->id);
 	for(auto & t : json["specialBattlefields"].Vector())
 		info->allowedSpecialBfields.emplace_back(t.String());