From 370c6bbd4b6acdb909f1a646c98228eeeedaca47 Mon Sep 17 00:00:00 2001 From: tomrus88 Date: Sun, 20 Dec 2009 06:11:51 +0300 Subject: [PATCH] Fixed some structs. --- src/game/Chat.cpp | 6 +++--- src/game/DBCEnums.h | 12 ++++++------ src/game/DBCStructure.h | 10 +++++----- src/game/Player.cpp | 2 +- src/game/SharedDefines.h | 15 ++++++++------- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index f510fc0e4..4d2d315a4 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -1721,7 +1721,7 @@ void ChatHandler::FillMessageData( WorldPacket *data, WorldSession* session, uin case CHAT_MSG_MONSTER_EMOTE: case CHAT_MSG_RAID_BOSS_WHISPER: case CHAT_MSG_RAID_BOSS_EMOTE: - case CHAT_MSG_BN: + case CHAT_MSG_BATTLENET: { *data << uint64(speaker->GetGUID()); *data << uint32(0); // 2.1.0 @@ -1740,7 +1740,7 @@ void ChatHandler::FillMessageData( WorldPacket *data, WorldSession* session, uin return; } default: - if (type != CHAT_MSG_REPLY && type != CHAT_MSG_IGNORED && type != CHAT_MSG_DND && type != CHAT_MSG_AFK) + if (type != CHAT_MSG_WHISPER_INFORM && type != CHAT_MSG_IGNORED && type != CHAT_MSG_DND && type != CHAT_MSG_AFK) target_guid = 0; // only for CHAT_MSG_WHISPER_INFORM used original value target_guid break; } @@ -1757,7 +1757,7 @@ void ChatHandler::FillMessageData( WorldPacket *data, WorldSession* session, uin *data << uint64(target_guid); *data << uint32(messageLength); *data << message; - if(session != 0 && type != CHAT_MSG_REPLY && type != CHAT_MSG_DND && type != CHAT_MSG_AFK) + if(session != 0 && type != CHAT_MSG_WHISPER_INFORM && type != CHAT_MSG_DND && type != CHAT_MSG_AFK) *data << uint8(session->GetPlayer()->chatTag()); else *data << uint8(0); diff --git a/src/game/DBCEnums.h b/src/game/DBCEnums.h index a5d4cf181..e458fb021 100644 --- a/src/game/DBCEnums.h +++ b/src/game/DBCEnums.h @@ -285,13 +285,13 @@ enum FactionMasks // if none flags set then non-aggressive creature }; -enum MapTypes +enum MapTypes // Lua_IsInInstance { - MAP_COMMON = 0, - MAP_INSTANCE = 1, - MAP_RAID = 2, - MAP_BATTLEGROUND = 3, - MAP_ARENA = 4 + MAP_COMMON = 0, // none + MAP_INSTANCE = 1, // party + MAP_RAID = 2, // raid + MAP_BATTLEGROUND = 3, // pvp + MAP_ARENA = 4 // arena }; enum AbilytyLearnType diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h index ec3e92ce9..5356a995c 100644 --- a/src/game/DBCStructure.h +++ b/src/game/DBCStructure.h @@ -1077,7 +1077,7 @@ struct MapEntry uint32 MapID; // 0 //char* internalname; // 1 unused uint32 map_type; // 2 - //uint32 unk_330; // 3 + //uint32 unk_330; // 3 some kind of flags (0x100 - CAN_CHANGE_PLAYER_DIFFICULTY) // 4 0 or 1 for battlegrounds (not arenas) char* name[16]; // 5-20 // 21 name flags, unused @@ -1086,13 +1086,13 @@ struct MapEntry // 39 intro text flags //char* allianceIntro[16]; // 40-55 text for PvP Zones // 56 intro text flags - uint32 multimap_id; // 57 - // 58 + uint32 multimap_id; // 57 index in LoadingScreens.dbc + // 58 BattlefieldMapIconScale int32 entrance_map; // 59 map_id of entrance map float entrance_x; // 60 entrance x coordinate (if exist single entry) float entrance_y; // 61 entrance y coordinate (if exist single entry) - // 62 -1, 0 and 720 - uint32 addon; // 63 (0-original maps,1-tbc addon) + // 62 time of day override + uint32 addon; // 63 expansion // 64 some kind of time? //uint32 maxPlayers; // 65 max players diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 5ed43ea45..431ed123b 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -16962,7 +16962,7 @@ void Player::Whisper(const std::string& text, uint32 language,uint64 receiver) if (language != LANG_ADDON) { data.Initialize(SMSG_MESSAGECHAT, 200); - rPlayer->BuildPlayerChat(&data, CHAT_MSG_REPLY, text, language); + rPlayer->BuildPlayerChat(&data, CHAT_MSG_WHISPER_INFORM, text, language); GetSession()->SendPacket(&data); } } diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index bfb9e1c27..a35898ae3 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -2317,8 +2317,8 @@ enum ChatMsg CHAT_MSG_OFFICER = 0x05, CHAT_MSG_YELL = 0x06, CHAT_MSG_WHISPER = 0x07, - CHAT_MSG_WHISPER_INFORM = 0x08, // WHISPER_FOREIGN? - CHAT_MSG_REPLY = 0x09, // WHISPER_INFORM? + CHAT_MSG_WHISPER_FOREIGN = 0x08, + CHAT_MSG_WHISPER_INFORM = 0x09, CHAT_MSG_EMOTE = 0x0A, CHAT_MSG_TEXT_EMOTE = 0x0B, CHAT_MSG_MONSTER_SAY = 0x0C, @@ -2350,19 +2350,20 @@ enum ChatMsg CHAT_MSG_BG_SYSTEM_HORDE = 0x26, CHAT_MSG_RAID_LEADER = 0x27, CHAT_MSG_RAID_WARNING = 0x28, - CHAT_MSG_RAID_BOSS_WHISPER = 0x29, - CHAT_MSG_RAID_BOSS_EMOTE = 0x2A, + CHAT_MSG_RAID_BOSS_EMOTE = 0x29, + CHAT_MSG_RAID_BOSS_WHISPER = 0x2A, CHAT_MSG_FILTERED = 0x2B, CHAT_MSG_BATTLEGROUND = 0x2C, CHAT_MSG_BATTLEGROUND_LEADER = 0x2D, CHAT_MSG_RESTRICTED = 0x2E, - CHAT_MSG_BN = 0x2F, + CHAT_MSG_BATTLENET = 0x2F, CHAT_MSG_ACHIEVEMENT = 0x30, CHAT_MSG_GUILD_ACHIEVEMENT = 0x31, - CHAT_MSG_PARTY_LEADER = 0x32 // guessed + CHAT_MSG_ARENA_POINTS = 0x32, + CHAT_MSG_PARTY_LEADER = 0x33 }; -#define MAX_CHAT_MSG_TYPE 0x33 +#define MAX_CHAT_MSG_TYPE 0x34 enum ChatLinkColors {