pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-27 04:07:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Push

Browse Source
This commit is contained in:
Kinglykrab
2025-06-25 23:25:04 -04:00
parent 26186ee9d9
commit f765809aed
1 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/quest_parser_collection.cpp
+10 -5
View File
@@ -1556,21 +1556,23 @@ QuestInterface* QuestParserCollection::GetQIByZoneQuest(std::string& filename)
return nullptr; return nullptr;
} }
std::string file_name;
for (auto& dir: PathManager::Instance()->GetQuestPaths()) {
const std::string& global_path = fmt::format( const std::string& global_path = fmt::format(
"{}/{}", "{}/{}",
path.GetQuestsPath(), dir,
QUEST_GLOBAL_DIRECTORY QUEST_GLOBAL_DIRECTORY
); );
const std::string& zone_path = fmt::format( const std::string& zone_path = fmt::format(
"{}/{}", "{}/{}",
path.GetQuestsPath(), dir,
zone->GetShortName() zone->GetShortName()
); );
const std::string& zone_versioned_path = fmt::format( const std::string& zone_versioned_path = fmt::format(
"{}/{}/v{}", "{}/{}/v{}",
path.GetQuestsPath(), dir,
zone->GetShortName(), zone->GetShortName(),
zone->GetInstanceVersion() zone->GetInstanceVersion()
); );
@@ -1582,7 +1584,6 @@ QuestInterface* QuestParserCollection::GetQIByZoneQuest(std::string& filename)
fmt::format("{}/zone", global_path) // Global fmt::format("{}/zone", global_path) // Global
}; };
std::string file_name;
for (auto& file: file_names) { for (auto& file: file_names) {
for (auto* e: _load_precedence) { for (auto* e: _load_precedence) {
file_name = fmt::format( file_name = fmt::format(
@@ -1597,6 +1598,7 @@ QuestInterface* QuestParserCollection::GetQIByZoneQuest(std::string& filename)
} }
} }
} }
}
return nullptr; return nullptr;
} }
@@ -1608,10 +1610,12 @@ QuestInterface* QuestParserCollection::GetQIByGlobalZoneQuest(std::string& filen
} }
std::string file_name; std::string file_name;
for (auto& dir: PathManager::Instance()->GetQuestPaths()) {
for (auto* e: _load_precedence) { for (auto* e: _load_precedence) {
file_name = fmt::format( file_name = fmt::format(
"{}/{}/global_zone.{}", "{}/{}/global_zone.{}",
path.GetQuestsPath(), dir,
QUEST_GLOBAL_DIRECTORY, QUEST_GLOBAL_DIRECTORY,
_extensions.find(e->GetIdentifier())->second _extensions.find(e->GetIdentifier())->second
); );
@@ -1621,6 +1625,7 @@ QuestInterface* QuestParserCollection::GetQIByGlobalZoneQuest(std::string& filen
return e; return e;
} }
} }
}
return nullptr; return nullptr;
} }