Explorar o código

Fix scope of identifiers resolving for commanders abilities

Ivan Savenko %!s(int64=2) %!d(string=hai) anos
pai
achega
10e852fcb9
Modificáronse 1 ficheiros con 5 adicións e 2 borrados
  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