games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Update JsonDetail.cpp

Browse Source 
Replaced new JSON by previous version of JSON comitted by IvanSav and added video file test again
This commit is contained in:
Macron1Robot 2014-04-30 13:11:04 +04:00
parent 9976fcc671
commit 345df14d60
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/JsonDetail.cpp
View File

@ -949,12 +949,6 @@ namespace
{
return testAnimation(node.String(), node.meta);
}
std::string videoFile(const JsonNode & node)
{
TEST_FILE(node.meta, "Video/", node.String(), EResType::VIDEO);
return "Video file \"" + node.String() + "\" was not found";
}
std::string imageFile(const JsonNode & node)
{
@ -964,6 +958,12 @@ namespace
return testAnimation(node.String().substr(0, node.String().find(':')), node.meta);
return "Image file \"" + node.String() + "\" was not found";
}
std::string videoFile(const JsonNode & node)
{
TEST_FILE(node.meta, "Video/", node.String(), EResType::VIDEO);
return "Video file \"" + node.String() + "\" was not found";
}
#undef TEST_FILE
}
@ -1046,8 +1046,8 @@ namespace
ret["soundFile"] = Formats::soundFile;
ret["defFile"] = Formats::defFile;
ret["animationFile"] = Formats::animationFile;
ret["videoFile"] = Formats::videoFile;
ret["imageFile"] = Formats::imageFile;
ret["videoFile"] = Formats::videoFile;
return ret;
}