diff options
| author | SnapperRy <snapperryen@gmail.com> | 2016-07-19 09:02:01 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-11 15:19:42 +0100 |
| commit | 13bac539d6c19b366be714c712c1acbcd4d1fb16 (patch) | |
| tree | 768d388f24719f3f6a3a5fca23a8d36558f8e584 /src/server/game/Quests | |
| parent | 8d45095e28911a9e832467141ca30336b53f83a2 (diff) | |
Core/Mail: implement a way to specify NPC sender for mails when they should be different from the quest ender (#17601)
(cherry picked from commit d4e15f1aac3159bb5e17808ee06efb847fdd4789)
# Conflicts:
# src/server/game/Quests/QuestDef.cpp
# src/server/game/Quests/QuestDef.h
Rename 9999_99_99_99_world.sql to sql/updates/world/3.3.5/2016_07_19_00_world.sql
(cherry picked from commit 3a77dec6e6fac47fedeb0aeddd09dfe12c3817a2)
Diffstat (limited to 'src/server/game/Quests')
| -rw-r--r-- | src/server/game/Quests/QuestDef.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Quests/QuestDef.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 4ba5e08f447..0dea1ed5335 100644 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -206,7 +206,8 @@ void Quest::LoadQuestTemplateAddon(Field* fields) RequiredMinRepValue = fields[13].GetInt32(); RequiredMaxRepValue = fields[14].GetInt32(); SourceItemIdCount = fields[15].GetUInt8(); - SpecialFlags = fields[16].GetUInt8(); + RewardMailSenderEntry = fields[16].GetUInt32(); + SpecialFlags = fields[17].GetUInt8(); if (SpecialFlags & QUEST_SPECIAL_FLAGS_AUTO_ACCEPT) Flags |= QUEST_FLAGS_AUTO_ACCEPT; diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h index 5cd67cab954..c8449d8dba6 100644 --- a/src/server/game/Quests/QuestDef.h +++ b/src/server/game/Quests/QuestDef.h @@ -359,6 +359,7 @@ class TC_GAME_API Quest uint32 GetRewSpell() const { return RewardSpell; } uint32 GetRewMailTemplateId() const { return RewardMailTemplateId; } uint32 GetRewMailDelaySecs() const { return RewardMailDelay; } + uint32 GetRewMailSenderEntry() const { return RewardMailSenderEntry; } uint32 GetRewTitle() const { return RewardTitleId; } uint32 GetPOIContinent() const { return POIContinent; } float GetPOIx() const { return POIx; } @@ -510,6 +511,7 @@ class TC_GAME_API Quest uint32 RequiredMaxRepFaction = 0; int32 RequiredMaxRepValue = 0; uint32 SourceItemIdCount = 0; + uint32 RewardMailSenderEntry = 0; uint32 SpecialFlags = 0; // custom flags, not sniffed/WDB }; |