diff --git a/zone/gm_commands/questerrors.cpp b/zone/gm_commands/questerrors.cpp index cbc35e599..70d7d2603 100755 --- a/zone/gm_commands/questerrors.cpp +++ b/zone/gm_commands/questerrors.cpp @@ -3,21 +3,24 @@ void command_questerrors(Client *c, const Seperator *sep) { - std::list err; - parse->GetErrors(err); - c->Message(Chat::White, "Current Quest Errors:"); + std::list quest_errors; + parse->GetErrors(quest_errors); - auto iter = err.begin(); - int i = 0; - while (iter != err.end()) { - if (i >= 30) { - c->Message(Chat::White, "Maximum of 30 Errors shown..."); - break; + if (quest_errors.size()) { + c->Message(Chat::White, "Quest errors currently are as follows:"); + + int error_index = 0; + for (auto quest_error : quest_errors) { + if (error_index >= 30) { + c->Message(Chat::White, "Maximum of 30 errors shown."); + break; + } + + c->Message(Chat::White, quest_error.c_str()); + error_index++; } - - c->Message(Chat::White, iter->c_str()); - ++i; - ++iter; + } else { + c->Message(Chat::White, "There are no Quest errors currently."); } } diff --git a/zone/quest_interface.h b/zone/quest_interface.h index 794251e36..1e7825b2c 100644 --- a/zone/quest_interface.h +++ b/zone/quest_interface.h @@ -81,8 +81,8 @@ public: virtual void RemoveEncounter(const std::string &name) { } //TODO: Set maximum quest errors instead of hard coding it - virtual void GetErrors(std::list &err) { - err.insert(err.end(), errors_.begin(), errors_.end()); + virtual void GetErrors(std::list &quest_errors) { + quest_errors.insert(quest_errors.end(), errors_.begin(), errors_.end()); } virtual void AddError(std::string error) { diff --git a/zone/quest_parser_collection.cpp b/zone/quest_parser_collection.cpp index 8c5185ad6..d3cdee560 100644 --- a/zone/quest_parser_collection.cpp +++ b/zone/quest_parser_collection.cpp @@ -991,11 +991,11 @@ QuestInterface *QuestParserCollection::GetQIByEncounterQuest(std::string encount return nullptr; } -void QuestParserCollection::GetErrors(std::list &err) { - err.clear(); +void QuestParserCollection::GetErrors(std::list &quest_errors) { + quest_errors.clear(); auto iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - (*iter)->GetErrors(err); + while (iter != _load_precedence.end()) { + (*iter)->GetErrors(quest_errors); ++iter; } } diff --git a/zone/quest_parser_collection.h b/zone/quest_parser_collection.h index c8ebc2427..eb5796236 100644 --- a/zone/quest_parser_collection.h +++ b/zone/quest_parser_collection.h @@ -83,7 +83,7 @@ public: int EventEncounter(QuestEventID evt, std::string encounter_name, std::string data, uint32 extra_data, std::vector *extra_pointers = nullptr); - void GetErrors(std::list &err); + void GetErrors(std::list &quest_errors); /* Internally used memory reference for all Perl Event Export Settings