games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

#1071 - In latest night builds there are problems with schema obstacle.json and file obstacles.json

Browse Source
This commit is contained in:
krs
2022-11-04 00:06:15 +02:00
parent ae1d2c50e2
commit aab394ff93
3 changed files with 128 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

252
config/obstacles.json
View File

File diff suppressed because it is too large Load Diff

2
config/schemas/obstacle.json
View File

@@ -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",

2
lib/ObstacleHandler.cpp
View File

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