Преглед на файлове

Update JsonDetail.cpp

Replaced new JSON by previous version of JSON comitted by IvanSav and added video file test again
Macron1Robot преди 11 години
родител
ревизия
345df14d60
променени са 1 файла, в които са добавени 7 реда и са изтрити 7 реда
  1. 7 7
      lib/JsonDetail.cpp

+ 7 - 7
lib/JsonDetail.cpp

@@ -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;
 	}