Add state for GM command completed quests. Thanks H0zen for assistance

mangosone · Nov 22, 2017 · cb51c9e · cb51c9e
1 parent deeea41
commit cb51c9e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/src/game/ChatCommands/Level3.cpp b/src/game/ChatCommands/Level3.cpp
@@ -5112,7 +5112,7 @@ bool ChatHandler::HandleQuestCompleteCommand(char* args)
     if (ReqOrRewMoney < 0)
         { player->ModifyMoney(-ReqOrRewMoney); }
 
-    player->CompleteQuest(entry);
+    player->CompleteQuest(entry, QUEST_STATUS_FORCE_COMPLETE);
     return true;
 }
 

diff --git a/src/game/Object/Player.cpp b/src/game/Object/Player.cpp
@@ -13042,11 +13042,11 @@ void Player::AddQuest(Quest const* pQuest, Object* questGiver)
     UpdateForQuestWorldObjects();
 }
 
-void Player::CompleteQuest(uint32 quest_id)
+void Player::CompleteQuest(uint32 quest_id, QuestStatus status)
 {
     if (quest_id)
     {
-        SetQuestStatus(quest_id, QUEST_STATUS_COMPLETE);
+        SetQuestStatus(quest_id, status);
 
         uint16 log_slot = FindQuestSlot(quest_id);
         if (log_slot < MAX_QUEST_LOG_SIZE)
@@ -13689,7 +13689,11 @@ QuestStatus Player::GetQuestStatus(uint32 quest_id) const
     {
         QuestStatusMap::const_iterator itr = mQuestStatus.find(quest_id);
         if (itr != mQuestStatus.end())
-            { return itr->second.m_status; }
+        {
+            if (itr->second.m_status == QUEST_STATUS_FORCE_COMPLETE)
+                return QUEST_STATUS_COMPLETE;
+            return itr->second.m_status;
+        }
     }
     return QUEST_STATUS_NONE;
 }

diff --git a/src/game/Object/Player.h b/src/game/Object/Player.h
@@ -1050,8 +1050,8 @@ class Player : public Unit
         void SetGMVisible(bool on);
         void SetPvPDeath(bool on)
         {
-            if (on) { m_ExtraFlags |= PLAYER_EXTRA_PVP_DEATH; } 
-            else { m_ExtraFlags &= ~PLAYER_EXTRA_PVP_DEATH; } 
+            if (on) { m_ExtraFlags |= PLAYER_EXTRA_PVP_DEATH; }
+            else { m_ExtraFlags &= ~PLAYER_EXTRA_PVP_DEATH; }
         }
 
         // 0 = own auction, -1 = enemy auction, 1 = goblin auction
@@ -1136,12 +1136,12 @@ class Player : public Unit
         void Say(const std::string& text, const uint32 language);
         void Yell(const std::string& text, const uint32 language);
         void TextEmote(const std::string& text);
-        /** 
+        /**
          * This will log a whisper depending on the setting LogWhispers in mangosd.conf, for a list
          * of available levels please see \ref WhisperLoggingLevels. The logging is done to database
          * in the table characters.character_whispers and includes to/from, text and when the whisper
          * was sent.
-         * 
+         *
          * @param text the text that was sent
          * @param receiver guid of the receiver of the message
          * \see WhisperLoggingLevels
@@ -1355,7 +1355,7 @@ class Player : public Unit
         bool CanRewardQuest(Quest const* pQuest, bool msg) const;
         bool CanRewardQuest(Quest const* pQuest, uint32 reward, bool msg) const;
         void AddQuest(Quest const* pQuest, Object* questGiver);
-        void CompleteQuest(uint32 quest_id);
+        void CompleteQuest(uint32 quest_id, QuestStatus status = QUEST_STATUS_FORCE_COMPLETE);
         void IncompleteQuest(uint32 quest_id);
         void RewardQuest(Quest const* pQuest, uint32 reward, Object* questGiver, bool announce = true);
 

diff --git a/src/game/WorldHandlers/QuestDef.h b/src/game/WorldHandlers/QuestDef.h
@@ -101,6 +101,7 @@ enum QuestStatus
     QUEST_STATUS_INCOMPLETE     = 3,
     QUEST_STATUS_AVAILABLE      = 4,                        // unused in fact
     QUEST_STATUS_FAILED         = 5,
+    QUEST_STATUS_FORCE_COMPLETE = 6,
     MAX_QUEST_STATUS
 };