mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some structs.

Browse source
This commit is contained in:
tomrus88 2009-12-20 06:11:51 +03:00
parent 90d76c61fa
commit 370c6bbd4b
5 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Chat.cpp
View file

@ -1721,7 +1721,7 @@ void ChatHandler::FillMessageData( WorldPacket *data, WorldSession* session, uin
case CHAT_MSG_MONSTER_EMOTE: case CHAT_MSG_MONSTER_EMOTE:
case CHAT_MSG_RAID_BOSS_WHISPER: case CHAT_MSG_RAID_BOSS_WHISPER:
case CHAT_MSG_RAID_BOSS_EMOTE: case CHAT_MSG_RAID_BOSS_EMOTE:
case CHAT_MSG_BN: case CHAT_MSG_BATTLENET:
{ {
*data << uint64(speaker->GetGUID()); *data << uint64(speaker->GetGUID());
*data << uint32(0); // 2.1.0 *data << uint32(0); // 2.1.0
@ -1740,7 +1740,7 @@ void ChatHandler::FillMessageData( WorldPacket *data, WorldSession* session, uin
return; return;
} }
default: 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 target_guid = 0; // only for CHAT_MSG_WHISPER_INFORM used original value target_guid
break; break;
} }
@ -1757,7 +1757,7 @@ void ChatHandler::FillMessageData( WorldPacket *data, WorldSession* session, uin
*data << uint64(target_guid); *data << uint64(target_guid);
*data << uint32(messageLength); *data << uint32(messageLength);
*data << message; *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()); *data << uint8(session->GetPlayer()->chatTag());
else else
*data << uint8(0); *data << uint8(0);

12
src/game/DBCEnums.h
View file

@ -285,13 +285,13 @@ enum FactionMasks
// if none flags set then non-aggressive creature // if none flags set then non-aggressive creature
}; };
enum MapTypes enum MapTypes // Lua_IsInInstance
{ {
MAP_COMMON = 0, MAP_COMMON = 0, // none
MAP_INSTANCE = 1, MAP_INSTANCE = 1, // party
MAP_RAID = 2, MAP_RAID = 2, // raid
MAP_BATTLEGROUND = 3, MAP_BATTLEGROUND = 3, // pvp
MAP_ARENA = 4 MAP_ARENA = 4 // arena
}; };
enum AbilytyLearnType enum AbilytyLearnType

10
src/game/DBCStructure.h
View file

@ -1077,7 +1077,7 @@ struct MapEntry
uint32 MapID; // 0 uint32 MapID; // 0
//char* internalname; // 1 unused //char* internalname; // 1 unused
uint32 map_type; // 2 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) // 4 0 or 1 for battlegrounds (not arenas)
char* name[16]; // 5-20 char* name[16]; // 5-20
// 21 name flags, unused // 21 name flags, unused
@ -1086,13 +1086,13 @@ struct MapEntry
// 39 intro text flags // 39 intro text flags
//char* allianceIntro[16]; // 40-55 text for PvP Zones //char* allianceIntro[16]; // 40-55 text for PvP Zones
// 56 intro text flags // 56 intro text flags
uint32 multimap_id; // 57 uint32 multimap_id; // 57 index in LoadingScreens.dbc
// 58 // 58 BattlefieldMapIconScale
int32 entrance_map; // 59 map_id of entrance map int32 entrance_map; // 59 map_id of entrance map
float entrance_x; // 60 entrance x coordinate (if exist single entry) float entrance_x; // 60 entrance x coordinate (if exist single entry)
float entrance_y; // 61 entrance y coordinate (if exist single entry) float entrance_y; // 61 entrance y coordinate (if exist single entry)
// 62 -1, 0 and 720 // 62 time of day override
uint32 addon; // 63 (0-original maps,1-tbc addon) uint32 addon; // 63 expansion
// 64 some kind of time? // 64 some kind of time?
//uint32 maxPlayers; // 65 max players //uint32 maxPlayers; // 65 max players

2
src/game/Player.cpp
View file

@ -16962,7 +16962,7 @@ void Player::Whisper(const std::string& text, uint32 language,uint64 receiver)
if (language != LANG_ADDON) if (language != LANG_ADDON)
{ {
data.Initialize(SMSG_MESSAGECHAT, 200); 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); GetSession()->SendPacket(&data);
} }
} }

15
src/game/SharedDefines.h
View file

@ -2317,8 +2317,8 @@ enum ChatMsg
CHAT_MSG_OFFICER = 0x05, CHAT_MSG_OFFICER = 0x05,
CHAT_MSG_YELL = 0x06, CHAT_MSG_YELL = 0x06,
CHAT_MSG_WHISPER = 0x07, CHAT_MSG_WHISPER = 0x07,
CHAT_MSG_WHISPER_INFORM = 0x08, // WHISPER_FOREIGN? CHAT_MSG_WHISPER_FOREIGN = 0x08,
CHAT_MSG_REPLY = 0x09, // WHISPER_INFORM? CHAT_MSG_WHISPER_INFORM = 0x09,
CHAT_MSG_EMOTE = 0x0A, CHAT_MSG_EMOTE = 0x0A,
CHAT_MSG_TEXT_EMOTE = 0x0B, CHAT_MSG_TEXT_EMOTE = 0x0B,
CHAT_MSG_MONSTER_SAY = 0x0C, CHAT_MSG_MONSTER_SAY = 0x0C,
@ -2350,19 +2350,20 @@ enum ChatMsg
CHAT_MSG_BG_SYSTEM_HORDE = 0x26, CHAT_MSG_BG_SYSTEM_HORDE = 0x26,
CHAT_MSG_RAID_LEADER = 0x27, CHAT_MSG_RAID_LEADER = 0x27,
CHAT_MSG_RAID_WARNING = 0x28, CHAT_MSG_RAID_WARNING = 0x28,
CHAT_MSG_RAID_BOSS_WHISPER = 0x29, CHAT_MSG_RAID_BOSS_EMOTE = 0x29,
CHAT_MSG_RAID_BOSS_EMOTE = 0x2A, CHAT_MSG_RAID_BOSS_WHISPER = 0x2A,
CHAT_MSG_FILTERED = 0x2B, CHAT_MSG_FILTERED = 0x2B,
CHAT_MSG_BATTLEGROUND = 0x2C, CHAT_MSG_BATTLEGROUND = 0x2C,
CHAT_MSG_BATTLEGROUND_LEADER = 0x2D, CHAT_MSG_BATTLEGROUND_LEADER = 0x2D,
CHAT_MSG_RESTRICTED = 0x2E, CHAT_MSG_RESTRICTED = 0x2E,
CHAT_MSG_BN = 0x2F, CHAT_MSG_BATTLENET = 0x2F,
CHAT_MSG_ACHIEVEMENT = 0x30, CHAT_MSG_ACHIEVEMENT = 0x30,
CHAT_MSG_GUILD_ACHIEVEMENT = 0x31, 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 enum ChatLinkColors
{ {