diff --git a/src/game/Creature.h b/src/game/Creature.h index 2a3a3582b..6afba20b7 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -54,6 +54,7 @@ enum CreatureFlagsExtra CREATURE_FLAG_EXTRA_NOT_TAUNTABLE = 0x00000100, // creature is immune to taunt auras and effect attack me CREATURE_FLAG_EXTRA_AGGRO_ZONE = 0x00000200, // creature sets itself in combat with zone on aggro CREATURE_FLAG_EXTRA_GUARD = 0x00000400, // creature is a guard + CREATURE_FLAG_EXTRA_NO_TALKTO_CREDIT= 0x00000800, // creature doesn't give quest-credits when talked to (temporarily flag) }; // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 73d92f080..91f1fb038 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -13071,7 +13071,7 @@ void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId) if (canTalkToCredit) { - if (pSource->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) + if (pSource->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP) && !(((Creature*)pSource)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_TALKTO_CREDIT)) TalkedToCreature(pSource->GetEntry(), pSource->GetObjectGuid()); } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 2686520fe..06e209f07 100644 --- 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 "11852" + #define REVISION_NR "11853" #endif // __REVISION_NR_H__