Sync QuestFlags with WPP

This commit is contained in:
hondacrx
2017-09-20 00:28:57 -04:00
parent 87e0b1a603
commit 780899e1d1
3 changed files with 16 additions and 10 deletions
+14 -8
View File
@@ -246,7 +246,7 @@ namespace Framework.Constants
} }
[Flags] [Flags]
public enum QuestFlags public enum QuestFlags : uint
{ {
None = 0x00, None = 0x00,
StayAlive = 0x01, // Not Used Currently StayAlive = 0x01, // Not Used Currently
@@ -268,13 +268,19 @@ namespace Framework.Constants
AutoComplete = 0x10000, // Quests with this flag player submit automatically by special button in player gui AutoComplete = 0x10000, // Quests with this flag player submit automatically by special button in player gui
DisplayItemInTracker = 0x20000, // Displays Usable Item In Quest Tracker DisplayItemInTracker = 0x20000, // Displays Usable Item In Quest Tracker
ObjText = 0x40000, // Use Objective Text As Complete Text ObjText = 0x40000, // Use Objective Text As Complete Text
AutoAccept = 0x80000, // The client recognizes this flag as auto-accept. However, NONE of the current quests (3.3.5a) have this flag. Maybe blizz used to use it, or will use it in the future. AutoAccept = 0x80000, // The client recognizes this flag as auto-accept.
Unk1 = 0x100000, // PlayerCastOnAccept = 0x100000,
AutoTake = 0x200000, // Automatically Suggestion Of Accepting Quest. Not From Npc. PlayerCastOnComplete = 0x200000,
//Unk2 = 0x400000, UpdatePhaseShift = 0x400000,
//Unk3 = 0x800000, // Found In Quest 14069 SorWhitelist = 0x800000,
//Unk4 = 0x1000000, LaunchGossipComplete = 0x1000000,
// ... 4.X Added Flags Up To 0x80000000 - All Unknown For Now RemoveExtraGetItems = 0x2000000,
HideUntilDiscovered = 0x4000000,
PortraitInQuestLog = 0x8000000,
ShowItemWhenCompleted = 0x10000000,
LaunchGossipAccept = 0x20000000,
ItemsGlowWhenDone = 0x40000000,
FailOnLogout = 0x80000000
} }
// last checked in 19802 // last checked in 19802
+1 -1
View File
@@ -337,7 +337,7 @@ namespace Game.Entities
switch (guid.GetHigh()) switch (guid.GetHigh())
{ {
case HighGuid.Player: case HighGuid.Player:
Contract.Assert(quest.HasFlag(QuestFlags.Unk1)); Contract.Assert(quest.HasFlag(QuestFlags.AutoComplete));
return Global.ObjectMgr.GetQuestTemplate(nextQuestID); return Global.ObjectMgr.GetQuestTemplate(nextQuestID);
case HighGuid.Creature: case HighGuid.Creature:
case HighGuid.Pet: case HighGuid.Pet:
+1 -1
View File
@@ -2207,7 +2207,7 @@ namespace Game.Entities
return Global.ObjAccessor.GetUnit(this, charmerid); return Global.ObjAccessor.GetUnit(this, charmerid);
return null; return null;
} }
Unit GetCharmerOrOwnerOrSelf() public Unit GetCharmerOrOwnerOrSelf()
{ {
Unit u = GetCharmerOrOwner(); Unit u = GetCharmerOrOwner();
if (u != null) if (u != null)