mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 13:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Some minor code cleanup for readability.

Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2010-06-05 11:58:22 +02:00
parent f94175f90f
commit 2760e7d353
2 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/game/QuestHandler.cpp
View file

@ -38,9 +38,10 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode( WorldPacket & recv_data )
uint8 defstatus = DIALOG_STATUS_NONE; uint8 defstatus = DIALOG_STATUS_NONE;
Object* questgiver = _player->GetObjectByTypeMask(guid, TYPEMASK_CREATURE_OR_GAMEOBJECT); 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; return;
} }
@ -48,23 +49,29 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode( WorldPacket & recv_data )
{ {
case TYPEID_UNIT: case TYPEID_UNIT:
{ {
DEBUG_LOG( "WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for npc, guid = %u",uint32(GUID_LOPART(guid)) ); 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 Creature* cr_questgiver = (Creature*)questgiver;
if (!cr_questgiver->IsHostileTo(_player)) // not show quest status to enemies
{ {
questStatus = Script->NPCDialogStatus(_player, cr_questgiver); questStatus = Script->NPCDialogStatus(_player, cr_questgiver);
if( questStatus > 6 )
if (questStatus > DIALOG_STATUS_REWARD_REP)
questStatus = getDialogStatus(_player, cr_questgiver, defstatus); questStatus = getDialogStatus(_player, cr_questgiver, defstatus);
} }
break; break;
} }
case TYPEID_GAMEOBJECT: case TYPEID_GAMEOBJECT:
{ {
DEBUG_LOG( "WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for GameObject guid = %u",uint32(GUID_LOPART(guid)) ); DEBUG_LOG("WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for GameObject guid = %u", uint32(GUID_LOPART(guid)));
GameObject* go_questgiver=(GameObject*)questgiver;
GameObject* go_questgiver = (GameObject*)questgiver;
questStatus = Script->GODialogStatus(_player, go_questgiver); questStatus = Script->GODialogStatus(_player, go_questgiver);
if( questStatus > 6 )
if (questStatus > DIALOG_STATUS_REWARD_REP)
questStatus = getDialogStatus(_player, go_questgiver, defstatus); questStatus = getDialogStatus(_player, go_questgiver, defstatus);
break; break;
} }
default: default:
@ -648,12 +655,16 @@ void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket
{ {
// need also pet quests case support // need also pet quests case support
Creature *questgiver = GetPlayer()->GetMap()->GetCreatureOrPetOrVehicle(*itr); Creature *questgiver = GetPlayer()->GetMap()->GetCreatureOrPetOrVehicle(*itr);
if(!questgiver || questgiver->IsHostileTo(_player))
if (!questgiver || questgiver->IsHostileTo(_player))
continue; continue;
if(!questgiver->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER))
if (!questgiver->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER))
continue; continue;
questStatus = Script->NPCDialogStatus(_player, questgiver); questStatus = Script->NPCDialogStatus(_player, questgiver);
if( questStatus > 6 )
if (questStatus > DIALOG_STATUS_REWARD_REP)
questStatus = getDialogStatus(_player, questgiver, defstatus); questStatus = getDialogStatus(_player, questgiver, defstatus);
data << uint64(questgiver->GetGUID()); data << uint64(questgiver->GetGUID());
@ -663,12 +674,16 @@ void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket
else if (itr->IsGameobject()) else if (itr->IsGameobject())
{ {
GameObject *questgiver = GetPlayer()->GetMap()->GetGameObject(*itr); GameObject *questgiver = GetPlayer()->GetMap()->GetGameObject(*itr);
if(!questgiver)
if (!questgiver)
continue; continue;
if(questgiver->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER)
if (questgiver->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER)
continue; continue;
questStatus = Script->GODialogStatus(_player, questgiver); questStatus = Script->GODialogStatus(_player, questgiver);
if( questStatus > 6 )
if (questStatus > DIALOG_STATUS_REWARD_REP)
questStatus = getDialogStatus(_player, questgiver, defstatus); questStatus = getDialogStatus(_player, questgiver, defstatus);
data << uint64(questgiver->GetGUID()); data << uint64(questgiver->GetGUID());

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10030" #define REVISION_NR "10031"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__