浏览代码

Fix scope of identifiers resolving for commanders abilities

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

+ 5 - 2
lib/CCreatureHandler.cpp

@@ -432,8 +432,11 @@ const CCreature * CCreatureHandler::getCreature(const std::string & scope, const
 
 void CCreatureHandler::loadCommanders()
 {
-	JsonNode data(ResourceID("config/commanders.json"));
-	data.setMeta(CModHandler::scopeBuiltin()); // assume that commanders are in core mod (for proper bonuses resolution)
+	ResourceID configResource("config/commanders.json");
+
+	std::string modSource = VLC->modh->findResourceOrigin(configResource);
+	JsonNode data(configResource);
+	data.setMeta(modSource);
 
 	const JsonNode & config = data; // switch to const data accessors