diff --git a/src/game/GossipDef.h b/src/game/GossipDef.h index 68744dba0..98caf2277 100644 --- a/src/game/GossipDef.h +++ b/src/game/GossipDef.h @@ -64,6 +64,16 @@ enum GossipOptionIcon GOSSIP_ICON_TABARD = 8, //tabard GOSSIP_ICON_BATTLE = 9, //two swords GOSSIP_ICON_DOT = 10, //yellow dot + GOSSIP_ICON_CHAT_11 = 11, //This and below are most the same visual as GOSSIP_ICON_CHAT + GOSSIP_ICON_CHAT_12 = 12, //but are still used for unknown reasons. + GOSSIP_ICON_CHAT_13 = 13, + GOSSIP_ICON_CHAT_14 = 14, // probably invalid + GOSSIP_ICON_CHAT_15 = 15, // probably invalid + GOSSIP_ICON_CHAT_16 = 16, + GOSSIP_ICON_CHAT_17 = 17, + GOSSIP_ICON_CHAT_18 = 18, + GOSSIP_ICON_CHAT_19 = 19, + GOSSIP_ICON_CHAT_20 = 20, GOSSIP_ICON_MAX }; diff --git a/src/game/ItemPrototype.h b/src/game/ItemPrototype.h index 053c68e7d..7ef526109 100644 --- a/src/game/ItemPrototype.h +++ b/src/game/ItemPrototype.h @@ -110,7 +110,7 @@ enum ITEM_FLAGS ITEM_FLAGS_WRAPPED = 0x00000008, // conflicts with heroic flag ITEM_FLAGS_HEROIC = 0x00000008, // weird... ITEM_FLAGS_BROKEN = 0x00000010, // appears red icon (like when item durability==0) - ITEM_FLAGS_UNK2 = 0x00000020, // saw this on item 43012, 43013, 46377, 52021... + ITEM_FLAGS_INDESTRUCTIBLE = 0x00000020, // used for totem. Item can not be destroyed, except by using spell (item can be reagent for spell and then allowed) ITEM_FLAGS_USABLE = 0x00000040, // ? ITEM_FLAGS_NO_EQUIP_COOLDOWN = 0x00000080, // ? ITEM_FLAGS_UNK3 = 0x00000100, // saw this on item 47115, 49295... diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index c477031e2..3e25e4bb5 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -1925,7 +1925,7 @@ enum CreatureTypeFlags CREATURE_TYPEFLAGS_MININGLOOT = 0x00000200, // Can be looted by miner CREATURE_TYPEFLAGS_UNK11 = 0x00000400, // no idea, but it used by client CREATURE_TYPEFLAGS_UNK12 = 0x00000800, // related to possibility to cast spells while mounted - CREATURE_TYPEFLAGS_UNK13 = 0x00001000, // ? Can aid any player in combat if in range? + CREATURE_TYPEFLAGS_CAN_ASSIST = 0x00001000, // Can aid any player (and group) in combat. Typically seen for escorting NPC's CREATURE_TYPEFLAGS_UNK14 = 0x00002000, // checked from calls in Lua_PetHasActionBar CREATURE_TYPEFLAGS_UNK15 = 0x00004000, // Lua_UnitGUID, client does guid_low &= 0xFF000000 if this flag is set CREATURE_TYPEFLAGS_ENGINEERLOOT = 0x00008000, // Can be looted by engineer diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index fda19a6d3..7651134dc 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 "10152" + #define REVISION_NR "10153" #endif // __REVISION_NR_H__