From 2a80cc694acb5079f846802d073f9764a0c61076 Mon Sep 17 00:00:00 2001 From: tomrus88 Date: Wed, 30 Dec 2009 01:13:56 +0300 Subject: [PATCH] Fixed some enums. --- src/game/ChatHandler.cpp | 2 +- src/game/GMTicketHandler.cpp | 1 + src/game/Guild.h | 19 ++++++++++--------- src/game/ItemPrototype.h | 5 ++++- src/game/Opcodes.cpp | 1 + src/game/Opcodes.h | 3 ++- src/game/QuestDef.cpp | 2 +- src/game/QuestDef.h | 18 ++++++++++-------- src/game/SharedDefines.h | 2 +- 9 files changed, 31 insertions(+), 22 deletions(-) diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp index bee6715ad..31ddecdaf 100644 --- a/src/game/ChatHandler.cpp +++ b/src/game/ChatHandler.cpp @@ -581,7 +581,7 @@ void WorldSession::HandleTextEmoteOpcode( WorldPacket & recv_data ) MaNGOS::EmoteChatBuilder emote_builder(*GetPlayer(), text_emote, emoteNum, unit); MaNGOS::LocalizedPacketDo emote_do(emote_builder); MaNGOS::PlayerDistWorker > emote_worker(GetPlayer(), sWorld.getConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE), emote_do); - TypeContainerVisitor >, WorldTypeMapContainer> message(emote_worker); + TypeContainerVisitor >, WorldTypeMapContainer> message(emote_worker); CellLock cell_lock(cell, p); cell_lock->Visit(cell_lock, message, *GetPlayer()->GetMap(), *GetPlayer(), sWorld.getConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE)); diff --git a/src/game/GMTicketHandler.cpp b/src/game/GMTicketHandler.cpp index 73d3dc034..e4cd9cff8 100644 --- a/src/game/GMTicketHandler.cpp +++ b/src/game/GMTicketHandler.cpp @@ -32,6 +32,7 @@ void WorldSession::SendGMTicketGetTicket(uint32 status, char const* text) data << uint32(status); // standard 0x0A, 0x06 if text present if(status == 6) { + data << uint32(123); // unk data << text; // ticket text data << uint8(0x7); // ticket category data << float(0); // tickets in queue? diff --git a/src/game/Guild.h b/src/game/Guild.h index 87b1f39b2..a8dcdc02c 100644 --- a/src/game/Guild.h +++ b/src/game/Guild.h @@ -117,15 +117,16 @@ enum GuildEvents GE_LEADER_CHANGED = 0x07, GE_DISBANDED = 0x08, GE_TABARDCHANGE = 0x09, - GE_UNK1 = 0x0A, // string, string - GE_UNK2 = 0x0B, - GE_SIGNED_ON = 0x0C, - GE_SIGNED_OFF = 0x0D, - GE_UNK3 = 0x0E, - GE_BANKTAB_PURCHASED= 0x0F, - GE_UNK5 = 0x10, - GE_UNK6 = 0x11, // string 0000000000002710 is 1 gold - GE_UNK7 = 0x12 + GE_UNK1 = 0x0A, // string, string EVENT_GUILD_ROSTER_UPDATE + GE_UNK2 = 0x0B, // EVENT_GUILD_ROSTER_UPDATE + GE_SIGNED_ON = 0x0C, // ERR_FRIEND_ONLINE_SS + GE_SIGNED_OFF = 0x0D, // ERR_FRIEND_OFFLINE_S + GE_UNK3 = 0x0E, // EVENT_GUILDBANKBAGSLOTS_CHANGED + GE_BANKTAB_PURCHASED= 0x0F, // EVENT_GUILDBANK_UPDATE_TABS + GE_UNK5 = 0x10, // EVENT_GUILDBANK_UPDATE_TABS + GE_UNK6 = 0x11, // EVENT_GUILDBANK_UPDATE_MONEY, string 0000000000002710 is 1 gold + GE_UNK7 = 0x12, // MSG_GUILD_BANK_MONEY_WITHDRAWN + GE_UNK8 = 0x13 // EVENT_GUILDBANK_TEXT_CHANGED }; enum PetitionTurns diff --git a/src/game/ItemPrototype.h b/src/game/ItemPrototype.h index cae4fd3f5..4175d1fe7 100644 --- a/src/game/ItemPrototype.h +++ b/src/game/ItemPrototype.h @@ -108,14 +108,17 @@ enum ITEM_FLAGS ITEM_FLAGS_CONJURED = 0x00000002, ITEM_FLAGS_OPENABLE = 0x00000004, ITEM_FLAGS_WRAPPED = 0x00000008, + ITEM_FLAGS_HEROIC = 0x00000008, // weird... ITEM_FLAGS_BROKEN = 0x00000010, // appears red icon (like when item durability==0) ITEM_FLAGS_TOTEM = 0x00000020, // ? ITEM_FLAGS_USABLE = 0x00000040, // ? + ITEM_FLAGS_NO_EQUIP_COOLDOWN = 0x00000080, // ? ITEM_FLAGS_WRAPPER = 0x00000200, // used or not used wrapper + ITEM_FLAGS_IGNORE_BAG_SPACE = 0x00000400, // ignore bag space at new item creation? ITEM_FLAGS_PARTY_LOOT = 0x00000800, // determines if item is party loot or not ITEM_FLAGS_REFUNDABLE = 0x00001000, // item cost can be refunded within 2 hours after purchase ITEM_FLAGS_CHARTER = 0x00002000, // arena/guild charter - ITEM_FLAGS_REFUNDABLE_2 = 0x00008000, + ITEM_FLAGS_REFUNDABLE_2 = 0x00008000, // ? ITEM_FLAGS_PROSPECTABLE = 0x00040000, ITEM_FLAGS_UNIQUE_EQUIPPED = 0x00080000, ITEM_FLAGS_USEABLE_IN_ARENA = 0x00200000, diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp index 9983f7859..802e71128 100644 --- a/src/game/Opcodes.cpp +++ b/src/game/Opcodes.cpp @@ -1312,4 +1312,5 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x503*/ { "UMSG_UNKNOWN_1283", STATUS_NEVER, &WorldSession::Handle_NULL }, /*0x504*/ { "UMSG_UNKNOWN_1284", STATUS_NEVER, &WorldSession::Handle_NULL }, /*0x505*/ { "UMSG_UNKNOWN_1285", STATUS_NEVER, &WorldSession::Handle_NULL }, + /*0x506*/ { "UMSG_UNKNOWN_1286", STATUS_NEVER, &WorldSession::Handle_NULL }, }; diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h index 963bbf5c5..91db76b5f 100644 --- a/src/game/Opcodes.h +++ b/src/game/Opcodes.h @@ -1320,7 +1320,8 @@ enum Opcodes UMSG_UNKNOWN_1283 = 0x503, UMSG_UNKNOWN_1284 = 0x504, UMSG_UNKNOWN_1285 = 0x505, - NUM_MSG_TYPES = 0x506 + UMSG_UNKNOWN_1285 = 0x506, + NUM_MSG_TYPES = 0x507 }; /// Player state diff --git a/src/game/QuestDef.cpp b/src/game/QuestDef.cpp index b9c068f86..17ddba486 100644 --- a/src/game/QuestDef.cpp +++ b/src/game/QuestDef.cpp @@ -130,7 +130,7 @@ Quest::Quest(Field * questRecord) QuestStartScript = questRecord[130].GetUInt32(); QuestCompleteScript = questRecord[131].GetUInt32(); - QuestFlags |= SpecialFlags << 16; + QuestFlags |= SpecialFlags << 24; m_reqitemscount = 0; m_reqCreatureOrGOcount = 0; diff --git a/src/game/QuestDef.h b/src/game/QuestDef.h index e7310c655..9d324590a 100644 --- a/src/game/QuestDef.h +++ b/src/game/QuestDef.h @@ -126,7 +126,7 @@ enum __QuestFlags QUEST_FLAGS_EXPLORATION = 0x00000004, // Not used currently QUEST_FLAGS_SHARABLE = 0x00000008, // Can be shared: Player::CanShareQuest() //QUEST_FLAGS_NONE2 = 0x00000010, // Not used currently - QUEST_FLAGS_EPIC = 0x00000020, // Not used currently: Unsure of content + QUEST_FLAGS_EPIC = 0x00000020, // Not used currently - 1 quest in 3.3 QUEST_FLAGS_RAID = 0x00000040, // Not used currently QUEST_FLAGS_TBC = 0x00000080, // Not used currently: Available if TBC expansion enabled only QUEST_FLAGS_UNK2 = 0x00000100, // Not used currently: _DELIVER_MORE Quest needs more than normal _q-item_ drops from mobs @@ -134,20 +134,22 @@ enum __QuestFlags QUEST_FLAGS_AUTO_REWARDED = 0x00000400, // These quests are automatically rewarded on quest complete and they will never appear in quest log client side. QUEST_FLAGS_TBC_RACES = 0x00000800, // Not used currently: Blood elf/Draenei starting zone quests QUEST_FLAGS_DAILY = 0x00001000, // Used to know quest is Daily one - QUEST_FLAGS_UNK3 = 0x00002000, + QUEST_FLAGS_UNK3 = 0x00002000, // activates PvP? QUEST_FLAGS_UNK4 = 0x00004000, // ? Membership Card Renewal QUEST_FLAGS_WEEKLY = 0x00008000, // Not used currently: Weekly quests + // 0x20000 - 1 quest in 3.3, 0x40000 - 1 quest in 3.3 + QUEST_FLAGS_LOW_LEVEL = 0x00080000 // quests in starting areas // Mangos flags for set SpecialFlags in DB if required but used only at server - QUEST_MANGOS_FLAGS_REPEATABLE = 0x010000, // Set by 1 in SpecialFlags from DB - QUEST_MANGOS_FLAGS_EXPLORATION_OR_EVENT = 0x020000, // Set by 2 in SpecialFlags from DB (if required area explore, spell SPELL_EFFECT_QUEST_COMPLETE casting, table `*_script` command SCRIPT_COMMAND_QUEST_EXPLORED use, set from script DLL) + QUEST_MANGOS_FLAGS_REPEATABLE = 0x01000000, // Set by 1 in SpecialFlags from DB + QUEST_MANGOS_FLAGS_EXPLORATION_OR_EVENT = 0x02000000, // Set by 2 in SpecialFlags from DB (if required area explore, spell SPELL_EFFECT_QUEST_COMPLETE casting, table `*_script` command SCRIPT_COMMAND_QUEST_EXPLORED use, set from script DLL) QUEST_MANGOS_FLAGS_DB_ALLOWED = 0xFFFF | QUEST_MANGOS_FLAGS_REPEATABLE | QUEST_MANGOS_FLAGS_EXPLORATION_OR_EVENT, // Mangos flags for internal use only - QUEST_MANGOS_FLAGS_DELIVER = 0x040000, // Internal flag computed only - QUEST_MANGOS_FLAGS_SPEAKTO = 0x080000, // Internal flag computed only - QUEST_MANGOS_FLAGS_KILL_OR_CAST = 0x100000, // Internal flag computed only - QUEST_MANGOS_FLAGS_TIMED = 0x200000, // Internal flag computed only + QUEST_MANGOS_FLAGS_DELIVER = 0x04000000, // Internal flag computed only + QUEST_MANGOS_FLAGS_SPEAKTO = 0x08000000, // Internal flag computed only + QUEST_MANGOS_FLAGS_KILL_OR_CAST = 0x10000000, // Internal flag computed only + QUEST_MANGOS_FLAGS_TIMED = 0x20000000, // Internal flag computed only }; struct QuestLocale diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index 23032b34d..60f3e82cd 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -226,7 +226,7 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = { #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_UNK8 0x00000100 // 8 +#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 #define SPELL_ATTR_UNK11 0x00000800 // 11