diff --git a/src/game/DBCEnums.h b/src/game/DBCEnums.h index 8170f5627..73a913b74 100644 --- a/src/game/DBCEnums.h +++ b/src/game/DBCEnums.h @@ -364,21 +364,21 @@ enum SummonPropType // SummonProperties.dbc, col 5 enum SummonPropFlags { - SUMMON_PROP_FLAG_NONE = 0x0000, // 1342 spells in 3.0.3 - SUMMON_PROP_FLAG_UNK1 = 0x0001, // 75 spells in 3.0.3, something unfriendly - SUMMON_PROP_FLAG_UNK2 = 0x0002, // 616 spells in 3.0.3, something friendly - SUMMON_PROP_FLAG_UNK3 = 0x0004, // 22 spells in 3.0.3, no idea... - SUMMON_PROP_FLAG_UNK4 = 0x0008, // 49 spells in 3.0.3, some mounts - SUMMON_PROP_FLAG_UNK5 = 0x0010, // 25 spells in 3.0.3, quest related? - SUMMON_PROP_FLAG_UNK6 = 0x0020, // 0 spells in 3.0.3, unused - SUMMON_PROP_FLAG_UNK7 = 0x0040, // 12 spells in 3.0.3, no idea - SUMMON_PROP_FLAG_UNK8 = 0x0080, // 4 spells in 3.0.3, no idea - SUMMON_PROP_FLAG_UNK9 = 0x0100, // 51 spells in 3.0.3, no idea, many quest related - SUMMON_PROP_FLAG_UNK10 = 0x0200, // 51 spells in 3.0.3, something defensive - SUMMON_PROP_FLAG_UNK11 = 0x0400, // 3 spells, requires something near? - SUMMON_PROP_FLAG_UNK12 = 0x0800, // 30 spells in 3.0.3, no idea - SUMMON_PROP_FLAG_UNK13 = 0x1000, // 8 spells in 3.0.3, siege vehicle - SUMMON_PROP_FLAG_UNK14 = 0x2000, // 2 spells in 3.0.3, escort? + SUMMON_PROP_FLAG_NONE = 0x0000, // 1342 spells in 3.0.3 + SUMMON_PROP_FLAG_UNK1 = 0x0001, // 75 spells in 3.0.3, something unfriendly + SUMMON_PROP_FLAG_UNK2 = 0x0002, // 616 spells in 3.0.3, something friendly + SUMMON_PROP_FLAG_UNK3 = 0x0004, // 22 spells in 3.0.3, no idea... + SUMMON_PROP_FLAG_UNK4 = 0x0008, // 49 spells in 3.0.3, some mounts + SUMMON_PROP_FLAG_UNK5 = 0x0010, // 25 spells in 3.0.3, quest related? + SUMMON_PROP_FLAG_CANT_BE_DISMISSED = 0x0020, // 0 spells in 3.0.3, unused + SUMMON_PROP_FLAG_UNK7 = 0x0040, // 12 spells in 3.0.3, no idea + SUMMON_PROP_FLAG_UNK8 = 0x0080, // 4 spells in 3.0.3, no idea + SUMMON_PROP_FLAG_UNK9 = 0x0100, // 51 spells in 3.0.3, no idea, many quest related + SUMMON_PROP_FLAG_UNK10 = 0x0200, // 51 spells in 3.0.3, something defensive + SUMMON_PROP_FLAG_UNK11 = 0x0400, // 3 spells, requires something near? + SUMMON_PROP_FLAG_UNK12 = 0x0800, // 30 spells in 3.0.3, no idea + SUMMON_PROP_FLAG_UNK13 = 0x1000, // 8 spells in 3.0.3, siege vehicle + SUMMON_PROP_FLAG_UNK14 = 0x2000, // 2 spells in 3.0.3, escort? }; #endif diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h index d649fe690..f2fcac996 100644 --- a/src/game/Opcodes.h +++ b/src/game/Opcodes.h @@ -1154,8 +1154,8 @@ enum Opcodes CMSG_FORCE_PITCH_RATE_CHANGE_ACK = 0x45D, SMSG_SPLINE_SET_PITCH_RATE = 0x45E, SMSG_MOVE_ABANDON_TRANSPORT = 0x45F, - MSG_MOVE_ABANDON_TRANSPORT = 0x460, - CMSG_MOVE_ABANDON_TRANSPORT_ACK = 0x461, + SMSG_CALENDAR_UPDATE_INVITE_LIST = 0x460, + SMSG_CALENDAR_UPDATE_INVITE_LIST2 = 0x461, CMSG_UPDATE_MISSILE_TRAJECTORY = 0x462, SMSG_UPDATE_ACCOUNT_DATA_COMPLETE = 0x463, SMSG_TRIGGER_MOVIE = 0x464, @@ -1171,7 +1171,7 @@ enum Opcodes CMSG_COMPLETE_ACHIEVEMENT_CHEAT = 0x46E, SMSG_QUESTUPDATE_ADD_PVP_KILL = 0x46F, CMSG_SET_CRITERIA_CHEAT = 0x470, - SMSG_GROUP_SWAP_FAILED = 0x471, + SMSG_CALENDAR_UPDATE_INVITE_LIST3 = 0x471, CMSG_UNITANIMTIER_CHEAT = 0x472, CMSG_CHAR_CUSTOMIZE = 0x473, SMSG_CHAR_CUSTOMIZE = 0x474, diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index 04bb4ebf1..db3183480 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -222,10 +222,10 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = { #define SPELL_ATTR_RANGED 0x00000002 // 1 All ranged abilites have this flag #define SPELL_ATTR_ON_NEXT_SWING_1 0x00000004 // 2 on next swing #define SPELL_ATTR_UNK3 0x00000008 // 3 not set in 3.0.3 -#define SPELL_ATTR_UNK4 0x00000010 // 4 +#define SPELL_ATTR_UNK4 0x00000010 // 4 isAbility #define SPELL_ATTR_TRADESPELL 0x00000020 // 5 trade spells, will be added by client to a sublist of profession spell #define SPELL_ATTR_PASSIVE 0x00000040 // 6 Passive spell -#define SPELL_ATTR_UNK7 0x00000080 // 7 visible? +#define SPELL_ATTR_UNK7 0x00000080 // 7 can't be linked in chat? #define SPELL_ATTR_UNK8 0x00000100 // 8 hide created item in tooltip (for effect=24) #define SPELL_ATTR_UNK9 0x00000200 // 9 #define SPELL_ATTR_ON_NEXT_SWING_2 0x00000400 // 10 on next swing 2 diff --git a/src/game/Unit.h b/src/game/Unit.h index e10869456..56a80343c 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -141,7 +141,7 @@ enum UnitStandStateType UNIT_STAND_STATE_SUBMERGED = 9 }; -// byte flag value (UNIT_FIELD_BYTES_1,2) +// byte flags value (UNIT_FIELD_BYTES_1,2) enum UnitStandFlags { UNIT_STAND_FLAGS_UNK1 = 0x01, @@ -161,7 +161,7 @@ enum UnitBytes1_Flags UNIT_BYTE1_FLAG_ALL = 0xFF }; -// high byte (3 from 0..3) of UNIT_FIELD_BYTES_2 +// byte value (UNIT_FIELD_BYTES_2,3) enum ShapeshiftForm { FORM_NONE = 0x00, @@ -197,7 +197,7 @@ enum ShapeshiftForm FORM_SPIRITOFREDEMPTION = 0x20, }; -// low byte ( 0 from 0..3 ) of UNIT_FIELD_BYTES_2 +// byte value (UNIT_FIELD_BYTES_2,0) enum SheathState { SHEATH_STATE_UNARMED = 0, // non prepared weapon @@ -207,7 +207,7 @@ enum SheathState #define MAX_SHEATH_STATE 3 -// byte (1 from 0..3) of UNIT_FIELD_BYTES_2 +// byte flags value (UNIT_FIELD_BYTES_2,1) enum UnitPVPStateFlags { UNIT_BYTE2_FLAG_PVP = 0x01, @@ -220,11 +220,11 @@ enum UnitPVPStateFlags UNIT_BYTE2_FLAG_UNK7 = 0x80 }; -// byte (2 from 0..3) of UNIT_FIELD_BYTES_2 +// byte flags value (UNIT_FIELD_BYTES_2,2) enum UnitRename { - UNIT_RENAME_NOT_ALLOWED = 0x02, - UNIT_RENAME_ALLOWED = 0x03 + UNIT_CAN_BE_RENAMED = 0x01, + UNIT_CAN_BE_ABANDONED = 0x02, }; #define CREATURE_MAX_SPELLS 4