浏览代码

Also check for json when checking for battle animation existance

Ivan Savenko 1 年之前
父节点
当前提交
22e58387f9
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      lib/CCreatureHandler.cpp

+ 3 - 1
lib/CCreatureHandler.cpp

@@ -648,7 +648,9 @@ CCreature * CCreatureHandler::loadFromJson(const std::string & scope, const Json
 
 	if (!cre->special &&
 		!CResourceHandler::get()->existsResource(cre->animDefName) &&
-		!CResourceHandler::get()->existsResource(cre->animDefName.addPrefix("SPRITES/")))
+		!CResourceHandler::get()->existsResource(cre->animDefName.toType<EResType::JSON>()) &&
+		!CResourceHandler::get()->existsResource(cre->animDefName.addPrefix("SPRITES/")) &&
+		!CResourceHandler::get()->existsResource(cre->animDefName.addPrefix("SPRITES/").toType<EResType::JSON>()))
 		throw ModLoadingException(scope, "creature " + cre->getJsonKey() + " has no combat animation but is not marked as special!" );
 
 	JsonNode advMapFile = node["graphics"]["map"];