[10031] Replace hard coded quest dialog status value with enum value

Some minor code cleanup for readability. Signed-off-by: NoFantasy <nofantasy@nf.no>
mangos · Jun 5, 2010 · 1265a13 · 1265a13
1 parent 82e9901
commit 1265a13
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 16 deletions.
diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp
@@ -38,33 +38,40 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode( WorldPacket & recv_data )
     uint8 defstatus = DIALOG_STATUS_NONE;
 
     Object* questgiver = _player->GetObjectByTypeMask(guid, TYPEMASK_CREATURE_OR_GAMEOBJECT);
-    if(!questgiver)
+
+    if (!questgiver)
     {
-        DETAIL_LOG("Error in CMSG_QUESTGIVER_STATUS_QUERY, called for not found questgiver (Typeid: %u GUID: %u)",GuidHigh2TypeId(GUID_HIPART(guid)),GUID_LOPART(guid));
+        DETAIL_LOG("Error in CMSG_QUESTGIVER_STATUS_QUERY, called for not found questgiver (Typeid: %u GUID: %u)", GuidHigh2TypeId(GUID_HIPART(guid)), GUID_LOPART(guid));
         return;
     }
 
     switch(questgiver->GetTypeId())
     {
         case TYPEID_UNIT:
         {
-            DEBUG_LOG( "WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for npc, guid = %u",uint32(GUID_LOPART(guid)) );
-            Creature* cr_questgiver=(Creature*)questgiver;
-            if( !cr_questgiver->IsHostileTo(_player))       // not show quest status to enemies
+            DEBUG_LOG("WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for npc, guid = %u", uint32(GUID_LOPART(guid)));
+
+            Creature* cr_questgiver = (Creature*)questgiver;
+
+            if (!cr_questgiver->IsHostileTo(_player))       // not show quest status to enemies
             {
                 questStatus = Script->NPCDialogStatus(_player, cr_questgiver);
-                if( questStatus > 6 )
+
+                if (questStatus > DIALOG_STATUS_REWARD_REP)
                     questStatus = getDialogStatus(_player, cr_questgiver, defstatus);
             }
             break;
         }
         case TYPEID_GAMEOBJECT:
         {
-            DEBUG_LOG( "WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for GameObject guid = %u",uint32(GUID_LOPART(guid)) );
-            GameObject* go_questgiver=(GameObject*)questgiver;
+            DEBUG_LOG("WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for GameObject guid = %u", uint32(GUID_LOPART(guid)));
+
+            GameObject* go_questgiver = (GameObject*)questgiver;
             questStatus = Script->GODialogStatus(_player, go_questgiver);
-            if( questStatus > 6 )
+
+            if (questStatus > DIALOG_STATUS_REWARD_REP)
                 questStatus = getDialogStatus(_player, go_questgiver, defstatus);
+
             break;
         }
         default:
@@ -648,12 +655,16 @@ void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket
         {
             // need also pet quests case support
             Creature *questgiver = GetPlayer()->GetMap()->GetCreatureOrPetOrVehicle(*itr);
-            if(!questgiver || questgiver->IsHostileTo(_player))
+
+            if (!questgiver || questgiver->IsHostileTo(_player))
                 continue;
-            if(!questgiver->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER))
+
+            if (!questgiver->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER))
                 continue;
+
             questStatus = Script->NPCDialogStatus(_player, questgiver);
-            if( questStatus > 6 )
+
+            if (questStatus > DIALOG_STATUS_REWARD_REP)
                 questStatus = getDialogStatus(_player, questgiver, defstatus);
 
             data << uint64(questgiver->GetGUID());
@@ -663,12 +674,16 @@ void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket
         else if (itr->IsGameobject())
         {
             GameObject *questgiver = GetPlayer()->GetMap()->GetGameObject(*itr);
-            if(!questgiver)
+
+            if (!questgiver)
                 continue;
-            if(questgiver->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER)
+
+            if (questgiver->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER)
                 continue;
+
             questStatus = Script->GODialogStatus(_player, questgiver);
-            if( questStatus > 6 )
+
+            if (questStatus > DIALOG_STATUS_REWARD_REP)
                 questStatus = getDialogStatus(_player, questgiver, defstatus);
 
             data << uint64(questgiver->GetGUID());

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10030"
+ #define REVISION_NR "10031"
 #endif // __REVISION_NR_H__