incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow duplicate quest names per game version

Browse Source
This commit is contained in:
Martin Michelsen
2022-05-18 01:04:23 -07:00
parent 9b0c294054
commit 2c9922cf33
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Quest.cc
-6
View File
@@ -609,12 +609,6 @@ QuestIndex::QuestIndex(const std::string& directory) : directory(directory) {
make_pair(q->version, q->menu_item_id), q).second) { make_pair(q->version, q->menu_item_id), q).second) {
throw logic_error("duplicate quest menu item id"); throw logic_error("duplicate quest menu item id");
} }
if (!this->version_name_to_quest.emplace(
make_pair(q->version, q->name), q).second) {
throw runtime_error(string_printf(
"duplicate quest name (%s-%" PRId64 "): %s",
name_for_version(q->version), q->internal_id, ascii_name.c_str()));
}
log(INFO, "Indexed quest %s (%s-%" PRId64 " => %" PRIu32 ", %s, episode=%hhu, joinable=%s, dcv1=%s)", log(INFO, "Indexed quest %s (%s-%" PRId64 " => %" PRIu32 ", %s, episode=%hhu, joinable=%s, dcv1=%s)",
ascii_name.c_str(), name_for_version(q->version), q->internal_id, ascii_name.c_str(), name_for_version(q->version), q->internal_id,
q->menu_item_id, name_for_category(q->category), q->episode, q->menu_item_id, name_for_category(q->category), q->episode,
src/Quest.hh
-1
View File
@@ -83,7 +83,6 @@ struct QuestIndex {
std::string directory; std::string directory;
std::map<std::pair<GameVersion, uint64_t>, std::shared_ptr<Quest>> version_menu_item_id_to_quest; std::map<std::pair<GameVersion, uint64_t>, std::shared_ptr<Quest>> version_menu_item_id_to_quest;
std::map<std::pair<GameVersion, std::u16string>, std::shared_ptr<Quest>> version_name_to_quest;
std::map<std::string, std::vector<std::shared_ptr<Quest>>> category_to_quests; std::map<std::string, std::vector<std::shared_ptr<Quest>>> category_to_quests;