More SMSG structure cleaned

This commit is contained in:
Olion 2017-07-22 18:35:03 +03:00
parent 0ad47ca255
commit 06cc8a9f9a
9 changed files with 39 additions and 48 deletions

View File

@ -194,7 +194,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recv_data)
// send status packet (in queue) // send status packet (in queue)
sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0); sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0);
member->GetSession()->SendPacket(&data); member->GetSession()->SendPacket(&data);
sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data, bgTypeId); sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data, int32(bg->GetMapId()));
member->GetSession()->SendPacket(&data); member->GetSession()->SendPacket(&data);
DEBUG_LOG("Battleground: player joined queue for bg queue type %u bg type %u: GUID %u, NAME %s", bgQueueTypeId, bgTypeId, member->GetGUIDLow(), member->GetName()); DEBUG_LOG("Battleground: player joined queue for bg queue type %u bg type %u: GUID %u, NAME %s", bgQueueTypeId, bgTypeId, member->GetGUIDLow(), member->GetName());
} }

View File

@ -885,7 +885,6 @@ void BattleGroundMgr::BuildBattleGroundStatusPacket(WorldPacket* data, BattleGro
data->Initialize(SMSG_BATTLEFIELD_STATUS, (4 + 8 + 4 + 1 + 4 + 4 + 4)); data->Initialize(SMSG_BATTLEFIELD_STATUS, (4 + 8 + 4 + 1 + 4 + 4 + 4));
*data << uint32(QueueSlot); // queue id (0...2) - player can be in 3 queues in time *data << uint32(QueueSlot); // queue id (0...2) - player can be in 3 queues in time
// uint64 in client
*data << uint32(bg->GetMapId()); // MapID *data << uint32(bg->GetMapId()); // MapID
*data << uint8(0); // Unknown *data << uint8(0); // Unknown
*data << uint32(bg->GetClientInstanceID()); *data << uint32(bg->GetClientInstanceID());
@ -969,19 +968,11 @@ void BattleGroundMgr::BuildPvpLogDataPacket(WorldPacket* data, BattleGround* bg)
} }
} }
void BattleGroundMgr::BuildGroupJoinedBattlegroundPacket(WorldPacket* data, BattleGroundTypeId bgTypeId) void BattleGroundMgr::BuildGroupJoinedBattlegroundPacket(WorldPacket* data, int32 status)
{ {
/*bgTypeId is:
0 - Your group has joined a battleground queue, but you are not eligible
1 - Your group has joined the queue for AV
2 - Your group has joined the queue for WS
3 - Your group has joined the queue for AB
4 - Your group has joined the queue for NA
5 - Your group has joined the queue for BE Arena
6 - Your group has joined the queue for All Arenas
7 - Your group has joined the queue for EotS*/
data->Initialize(SMSG_GROUP_JOINED_BATTLEGROUND, 4); data->Initialize(SMSG_GROUP_JOINED_BATTLEGROUND, 4);
*data << uint32(bgTypeId); // for status, see enum BattleGroundGroupJoinStatus
*data << int32(status);
} }
void BattleGroundMgr::BuildUpdateWorldStatePacket(WorldPacket* data, uint32 field, uint32 value) void BattleGroundMgr::BuildUpdateWorldStatePacket(WorldPacket* data, uint32 field, uint32 value)

View File

@ -104,6 +104,13 @@ enum BattleGroundQueueGroupTypes
}; };
#define BG_QUEUE_GROUP_TYPES_COUNT 4 #define BG_QUEUE_GROUP_TYPES_COUNT 4
enum BattleGroundGroupJoinStatus
{
BG_GROUPJOIN_DESERTERS = -2,
BG_GROUPJOIN_FAILED = -1 // actually, any negative except 2
// any other value is a MapID meaning successful join
};
class BattleGround; class BattleGround;
/** /**
* @brief * @brief
@ -446,7 +453,7 @@ class BattleGroundMgr
* @param data * @param data
* @param bgTypeId * @param bgTypeId
*/ */
void BuildGroupJoinedBattlegroundPacket(WorldPacket* data, BattleGroundTypeId bgTypeId); void BuildGroupJoinedBattlegroundPacket(WorldPacket* data, int32 status);
/** /**
* @brief * @brief
* *

View File

@ -111,10 +111,11 @@ struct PetSpell
enum ActionFeedback enum ActionFeedback
{ {
FEEDBACK_NONE = 0, FEEDBACK_PET_NONE = 0, // custom, not to be sent
FEEDBACK_PET_DEAD = 1, FEEDBACK_PET_DEAD = 1,
FEEDBACK_NOTHING_TO_ATT = 2, FEEDBACK_NOTHING_TO_ATT = 2,
FEEDBACK_CANT_ATT_TARGET = 3 FEEDBACK_CANT_ATT_TARGET = 3,
FEEDBACK_NO_PATH_TO = 4
}; };
enum PetTalk enum PetTalk

View File

@ -8726,13 +8726,6 @@ void Unit::SetFeignDeath(bool apply, ObjectGuid casterGuid /*= ObjectGuid()*/)
{ {
if (apply) if (apply)
{ {
/*
WorldPacket data(SMSG_FEIGN_DEATH_RESISTED, 9);
data<<GetGUID();
data<<uint8(0);
SendMessageToSet(&data,true);
*/
if (GetTypeId() != TYPEID_PLAYER) if (GetTypeId() != TYPEID_PLAYER)
{ StopMoving(); } { StopMoving(); }
else else
@ -8757,11 +8750,9 @@ void Unit::SetFeignDeath(bool apply, ObjectGuid casterGuid /*= ObjectGuid()*/)
} }
else else
{ {
/* /* when appropriate! not within this method
WorldPacket data(SMSG_FEIGN_DEATH_RESISTED, 9); WorldPacket data(SMSG_FEIGN_DEATH_RESISTED, 0);
data<<GetGUID(); SendDirectMessage(&data);
data<<uint8(1);
SendMessageToSet(&data,true);
*/ */
RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29); RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29);

View File

@ -739,48 +739,48 @@ void Opcodes::BuildOpcodeList()
/*0x2A6*/ StoreOpcode(SMSG_SPELL_FAILED_OTHER, "SMSG_SPELL_FAILED_OTHER", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2A6*/ StoreOpcode(SMSG_SPELL_FAILED_OTHER, "SMSG_SPELL_FAILED_OTHER", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*0x2A7*/ StoreOpcode(SMSG_GAMEOBJECT_RESET_STATE, "SMSG_GAMEOBJECT_RESET_STATE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2A7*/ StoreOpcode(SMSG_GAMEOBJECT_RESET_STATE, "SMSG_GAMEOBJECT_RESET_STATE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*[-ZERO] Need check */ /*0x2A8*/ StoreOpcode(CMSG_REPAIR_ITEM, "CMSG_REPAIR_ITEM", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRepairItemOpcode); /*[-ZERO] Need check */ /*0x2A8*/ StoreOpcode(CMSG_REPAIR_ITEM, "CMSG_REPAIR_ITEM", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRepairItemOpcode);
/*[-ZERO] Need check */ /*0x2A9*/ StoreOpcode(SMSG_CHAT_PLAYER_NOT_FOUND, "SMSG_CHAT_PLAYER_NOT_FOUND", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2A9*/ StoreOpcode(SMSG_CHAT_PLAYER_NOT_FOUND, "SMSG_CHAT_PLAYER_NOT_FOUND", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*[-ZERO] Need check */ /*0x2AA*/ StoreOpcode(MSG_TALENT_WIPE_CONFIRM, "MSG_TALENT_WIPE_CONFIRM", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTalentWipeConfirmOpcode); /*0x2AA*/ StoreOpcode(MSG_TALENT_WIPE_CONFIRM, "MSG_TALENT_WIPE_CONFIRM", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTalentWipeConfirmOpcode);
/*[-ZERO] Need check */ /*0x2AB*/ StoreOpcode(SMSG_SUMMON_REQUEST, "SMSG_SUMMON_REQUEST", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2AB*/ StoreOpcode(SMSG_SUMMON_REQUEST, "SMSG_SUMMON_REQUEST", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*[-ZERO] Need check */ /*0x2AC*/ StoreOpcode(CMSG_SUMMON_RESPONSE, "CMSG_SUMMON_RESPONSE", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSummonResponseOpcode); /*[-ZERO] Need check */ /*0x2AC*/ StoreOpcode(CMSG_SUMMON_RESPONSE, "CMSG_SUMMON_RESPONSE", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSummonResponseOpcode);
/*0x2AD*/ StoreOpcode(MSG_MOVE_TOGGLE_GRAVITY_CHEAT, "MSG_MOVE_TOGGLE_GRAVITY_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL); /*0x2AD*/ StoreOpcode(MSG_MOVE_TOGGLE_GRAVITY_CHEAT, "MSG_MOVE_TOGGLE_GRAVITY_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL);
/*[-ZERO] Need check */ /*0x2AE*/ StoreOpcode(SMSG_MONSTER_MOVE_TRANSPORT, "SMSG_MONSTER_MOVE_TRANSPORT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2AE*/ StoreOpcode(SMSG_MONSTER_MOVE_TRANSPORT, "SMSG_MONSTER_MOVE_TRANSPORT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*[-ZERO] Need check */ /*0x2AF*/ StoreOpcode(SMSG_PET_BROKEN, "SMSG_PET_BROKEN", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2AF*/ StoreOpcode(SMSG_PET_BROKEN, "SMSG_PET_BROKEN", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*0x2B0*/ StoreOpcode(MSG_MOVE_FEATHER_FALL, "MSG_MOVE_FEATHER_FALL", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL); /*0x2B0*/ StoreOpcode(MSG_MOVE_FEATHER_FALL, "MSG_MOVE_FEATHER_FALL", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL);
/*0x2B1*/ StoreOpcode(MSG_MOVE_WATER_WALK, "MSG_MOVE_WATER_WALK", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL); /*0x2B1*/ StoreOpcode(MSG_MOVE_WATER_WALK, "MSG_MOVE_WATER_WALK", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL);
/*0x2B2*/ StoreOpcode(CMSG_SERVER_BROADCAST, "CMSG_SERVER_BROADCAST", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL); /*0x2B2*/ StoreOpcode(CMSG_SERVER_BROADCAST, "CMSG_SERVER_BROADCAST", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL);
/*[-ZERO] Need check */ /*0x2B3*/ StoreOpcode(CMSG_SELF_RES, "CMSG_SELF_RES", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSelfResOpcode); /*[-ZERO] Need check */ /*0x2B3*/ StoreOpcode(CMSG_SELF_RES, "CMSG_SELF_RES", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSelfResOpcode);
/*[-ZERO] Need check */ /*0x2B4*/ StoreOpcode(SMSG_FEIGN_DEATH_RESISTED, "SMSG_FEIGN_DEATH_RESISTED", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2B4*/ StoreOpcode(SMSG_FEIGN_DEATH_RESISTED, "SMSG_FEIGN_DEATH_RESISTED", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*0x2B5*/ StoreOpcode(CMSG_RUN_SCRIPT, "CMSG_RUN_SCRIPT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL); /*0x2B5*/ StoreOpcode(CMSG_RUN_SCRIPT, "CMSG_RUN_SCRIPT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL);
/*[-ZERO] Need check */ /*0x2B6*/ StoreOpcode(SMSG_SCRIPT_MESSAGE, "SMSG_SCRIPT_MESSAGE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*[-ZERO] Need check */ /*0x2B6*/ StoreOpcode(SMSG_SCRIPT_MESSAGE, "SMSG_SCRIPT_MESSAGE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*0x2B7*/ StoreOpcode(SMSG_DUEL_COUNTDOWN, "SMSG_DUEL_COUNTDOWN", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2B7*/ StoreOpcode(SMSG_DUEL_COUNTDOWN, "SMSG_DUEL_COUNTDOWN", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*[-ZERO] Need check */ /*0x2B8*/ StoreOpcode(SMSG_AREA_TRIGGER_MESSAGE, "SMSG_AREA_TRIGGER_MESSAGE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2B8*/ StoreOpcode(SMSG_AREA_TRIGGER_MESSAGE, "SMSG_AREA_TRIGGER_MESSAGE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*0x2B9*/ StoreOpcode(CMSG_TOGGLE_HELM, "CMSG_TOGGLE_HELM", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleShowingHelmOpcode); /*0x2B9*/ StoreOpcode(CMSG_TOGGLE_HELM, "CMSG_TOGGLE_HELM", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleShowingHelmOpcode);
/*0x2BA*/ StoreOpcode(CMSG_TOGGLE_CLOAK, "CMSG_TOGGLE_CLOAK", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleShowingCloakOpcode); /*0x2BA*/ StoreOpcode(CMSG_TOGGLE_CLOAK, "CMSG_TOGGLE_CLOAK", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleShowingCloakOpcode);
/*0x2BB*/ StoreOpcode(SMSG_MEETINGSTONE_JOINFAILED, "SMSG_MEETINGSTONE_JOINFAILED", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2BB*/ StoreOpcode(SMSG_MEETINGSTONE_JOINFAILED, "SMSG_MEETINGSTONE_JOINFAILED", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*[-ZERO] Need check */ /*0x2BC*/ StoreOpcode(SMSG_PLAYER_SKINNED, "SMSG_PLAYER_SKINNED", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2BC*/ StoreOpcode(SMSG_PLAYER_SKINNED, "SMSG_PLAYER_SKINNED", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*[-ZERO] Need check */ /*0x2BD*/ StoreOpcode(SMSG_DURABILITY_DAMAGE_DEATH, "SMSG_DURABILITY_DAMAGE_DEATH", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2BD*/ StoreOpcode(SMSG_DURABILITY_DAMAGE_DEATH, "SMSG_DURABILITY_DAMAGE_DEATH", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*0x2BE*/ StoreOpcode(CMSG_SET_EXPLORATION, "CMSG_SET_EXPLORATION", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL); /*0x2BE*/ StoreOpcode(CMSG_SET_EXPLORATION, "CMSG_SET_EXPLORATION", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL);
/*0x2BF*/ StoreOpcode(CMSG_SET_ACTIONBAR_TOGGLES, "CMSG_SET_ACTIONBAR_TOGGLES", STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::HandleSetActionBarTogglesOpcode); /*0x2BF*/ StoreOpcode(CMSG_SET_ACTIONBAR_TOGGLES, "CMSG_SET_ACTIONBAR_TOGGLES", STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::HandleSetActionBarTogglesOpcode);
/*0x2C0*/ StoreOpcode(UMSG_DELETE_GUILD_CHARTER, "UMSG_DELETE_GUILD_CHARTER", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL); /*0x2C0*/ StoreOpcode(UMSG_DELETE_GUILD_CHARTER, "UMSG_DELETE_GUILD_CHARTER", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL);
/*[-ZERO] Need check */ /*0x2C1*/ StoreOpcode(MSG_PETITION_RENAME, "MSG_PETITION_RENAME", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePetitionRenameOpcode); /*0x2C1*/ StoreOpcode(MSG_PETITION_RENAME, "MSG_PETITION_RENAME", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePetitionRenameOpcode);
/*[-ZERO] Need check */ /*0x2C2*/ StoreOpcode(SMSG_INIT_WORLD_STATES, "SMSG_INIT_WORLD_STATES", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2C2*/ StoreOpcode(SMSG_INIT_WORLD_STATES, "SMSG_INIT_WORLD_STATES", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*[-ZERO] Need check */ /*0x2C3*/ StoreOpcode(SMSG_UPDATE_WORLD_STATE, "SMSG_UPDATE_WORLD_STATE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2C3*/ StoreOpcode(SMSG_UPDATE_WORLD_STATE, "SMSG_UPDATE_WORLD_STATE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*[-ZERO] Need check */ /*0x2C4*/ StoreOpcode(CMSG_ITEM_NAME_QUERY, "CMSG_ITEM_NAME_QUERY", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleItemNameQueryOpcode); /*[-ZERO] Need check */ /*0x2C4*/ StoreOpcode(CMSG_ITEM_NAME_QUERY, "CMSG_ITEM_NAME_QUERY", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleItemNameQueryOpcode);
/*[-ZERO] Need check */ /*0x2C5*/ StoreOpcode(SMSG_ITEM_NAME_QUERY_RESPONSE, "SMSG_ITEM_NAME_QUERY_RESPONSE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2C5*/ StoreOpcode(SMSG_ITEM_NAME_QUERY_RESPONSE, "SMSG_ITEM_NAME_QUERY_RESPONSE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*[-ZERO] Need check */ /*0x2C6*/ StoreOpcode(SMSG_PET_ACTION_FEEDBACK, "SMSG_PET_ACTION_FEEDBACK", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2C6*/ StoreOpcode(SMSG_PET_ACTION_FEEDBACK, "SMSG_PET_ACTION_FEEDBACK", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*[-ZERO] Need check */ /*0x2C7*/ StoreOpcode(CMSG_CHAR_RENAME, "CMSG_CHAR_RENAME", STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::HandleCharRenameOpcode); /*[-ZERO] Need check */ /*0x2C7*/ StoreOpcode(CMSG_CHAR_RENAME, "CMSG_CHAR_RENAME", STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::HandleCharRenameOpcode);
/*0x2C8*/ StoreOpcode(SMSG_CHAR_RENAME, "SMSG_CHAR_RENAME", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2C8*/ StoreOpcode(SMSG_CHAR_RENAME, "SMSG_CHAR_RENAME", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*[-ZERO] Need check */ /*0x2C9*/ StoreOpcode(CMSG_MOVE_SPLINE_DONE, "CMSG_MOVE_SPLINE_DONE", STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMoveSplineDoneOpcode); /*[-ZERO] Need check */ /*0x2C9*/ StoreOpcode(CMSG_MOVE_SPLINE_DONE, "CMSG_MOVE_SPLINE_DONE", STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMoveSplineDoneOpcode);
/*0x2CA*/ StoreOpcode(CMSG_MOVE_FALL_RESET, "CMSG_MOVE_FALL_RESET", STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes); /*0x2CA*/ StoreOpcode(CMSG_MOVE_FALL_RESET, "CMSG_MOVE_FALL_RESET", STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes);
/*[-ZERO] Need check */ /*0x2CB*/ StoreOpcode(SMSG_INSTANCE_SAVE_CREATED, "SMSG_INSTANCE_SAVE_CREATED", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2CB*/ StoreOpcode(SMSG_INSTANCE_SAVE_CREATED, "SMSG_INSTANCE_SAVE_CREATED", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*0x2CC*/ StoreOpcode(SMSG_RAID_INSTANCE_INFO, "SMSG_RAID_INSTANCE_INFO", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2CC*/ StoreOpcode(SMSG_RAID_INSTANCE_INFO, "SMSG_RAID_INSTANCE_INFO", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*0x2CD*/ StoreOpcode(CMSG_REQUEST_RAID_INFO, "CMSG_REQUEST_RAID_INFO", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRequestRaidInfoOpcode); /*0x2CD*/ StoreOpcode(CMSG_REQUEST_RAID_INFO, "CMSG_REQUEST_RAID_INFO", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRequestRaidInfoOpcode);
/*[-ZERO] Need check */ /*0x2CE*/ StoreOpcode(CMSG_MOVE_TIME_SKIPPED, "CMSG_MOVE_TIME_SKIPPED", STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleMoveTimeSkippedOpcode); /*[-ZERO] Need check */ /*0x2CE*/ StoreOpcode(CMSG_MOVE_TIME_SKIPPED, "CMSG_MOVE_TIME_SKIPPED", STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleMoveTimeSkippedOpcode);
/*0x2CF*/ StoreOpcode(CMSG_MOVE_FEATHER_FALL_ACK, "CMSG_MOVE_FEATHER_FALL_ACK", STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleFeatherFallAck); /*0x2CF*/ StoreOpcode(CMSG_MOVE_FEATHER_FALL_ACK, "CMSG_MOVE_FEATHER_FALL_ACK", STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleFeatherFallAck);
/*0x2D0*/ StoreOpcode(CMSG_MOVE_WATER_WALK_ACK, "CMSG_MOVE_WATER_WALK_ACK", STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMoveWaterWalkAck); /*0x2D0*/ StoreOpcode(CMSG_MOVE_WATER_WALK_ACK, "CMSG_MOVE_WATER_WALK_ACK", STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMoveWaterWalkAck);
/*0x2D1*/ StoreOpcode(CMSG_MOVE_NOT_ACTIVE_MOVER, "CMSG_MOVE_NOT_ACTIVE_MOVER", STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMoveNotActiveMoverOpcode); /*0x2D1*/ StoreOpcode(CMSG_MOVE_NOT_ACTIVE_MOVER, "CMSG_MOVE_NOT_ACTIVE_MOVER", STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMoveNotActiveMoverOpcode);
/*[-ZERO] Need check */ /*0x2D2*/ StoreOpcode(SMSG_PLAY_SOUND, "SMSG_PLAY_SOUND", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2D2*/ StoreOpcode(SMSG_PLAY_SOUND, "SMSG_PLAY_SOUND", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*0x2D3*/ StoreOpcode(CMSG_BATTLEFIELD_STATUS, "CMSG_BATTLEFIELD_STATUS", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlefieldStatusOpcode); /*0x2D3*/ StoreOpcode(CMSG_BATTLEFIELD_STATUS, "CMSG_BATTLEFIELD_STATUS", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlefieldStatusOpcode);
/*0x2D4*/ StoreOpcode(SMSG_BATTLEFIELD_STATUS, "SMSG_BATTLEFIELD_STATUS", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2D4*/ StoreOpcode(SMSG_BATTLEFIELD_STATUS, "SMSG_BATTLEFIELD_STATUS", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*0x2D5*/ StoreOpcode(CMSG_BATTLEFIELD_PORT, "CMSG_BATTLEFIELD_PORT", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattleFieldPortOpcode); /*0x2D5*/ StoreOpcode(CMSG_BATTLEFIELD_PORT, "CMSG_BATTLEFIELD_PORT", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattleFieldPortOpcode);
@ -802,7 +802,7 @@ void Opcodes::BuildOpcodeList()
/*0x2E5*/ StoreOpcode(CMSG_GM_UNTEACH, "CMSG_GM_UNTEACH", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL); /*0x2E5*/ StoreOpcode(CMSG_GM_UNTEACH, "CMSG_GM_UNTEACH", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL);
/*[-ZERO] Need check */ /*0x2E6*/ StoreOpcode(SMSG_WARDEN_DATA, "SMSG_WARDEN_DATA", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*[-ZERO] Need check */ /*0x2E6*/ StoreOpcode(SMSG_WARDEN_DATA, "SMSG_WARDEN_DATA", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*[-ZERO] Need check */ /*0x2E7*/ StoreOpcode(CMSG_WARDEN_DATA, "CMSG_WARDEN_DATA", STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::HandleWardenDataOpcode); /*[-ZERO] Need check */ /*0x2E7*/ StoreOpcode(CMSG_WARDEN_DATA, "CMSG_WARDEN_DATA", STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::HandleWardenDataOpcode);
/*[-ZERO] Need check */ /*0x2E8*/ StoreOpcode(SMSG_GROUP_JOINED_BATTLEGROUND, "SMSG_GROUP_JOINED_BATTLEGROUND", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x2E8*/ StoreOpcode(SMSG_GROUP_JOINED_BATTLEGROUND, "SMSG_GROUP_JOINED_BATTLEGROUND", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);
/*[-ZERO] Need check */ /*0x2E9*/ StoreOpcode(MSG_BATTLEGROUND_PLAYER_POSITIONS, "MSG_BATTLEGROUND_PLAYER_POSITIONS", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattleGroundPlayerPositionsOpcode); /*[-ZERO] Need check */ /*0x2E9*/ StoreOpcode(MSG_BATTLEGROUND_PLAYER_POSITIONS, "MSG_BATTLEGROUND_PLAYER_POSITIONS", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattleGroundPlayerPositionsOpcode);
/*0x2EA*/ StoreOpcode(CMSG_PET_STOP_ATTACK, "CMSG_PET_STOP_ATTACK", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePetStopAttack); /*0x2EA*/ StoreOpcode(CMSG_PET_STOP_ATTACK, "CMSG_PET_STOP_ATTACK", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePetStopAttack);
/*[-ZERO] Need check */ /*0x2EB*/ StoreOpcode(SMSG_BINDER_CONFIRM, "SMSG_BINDER_CONFIRM", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*[-ZERO] Need check */ /*0x2EB*/ StoreOpcode(SMSG_BINDER_CONFIRM, "SMSG_BINDER_CONFIRM", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide);

View File

@ -1215,7 +1215,7 @@ void WorldSession::HandleItemNameQueryOpcode(WorldPacket& recv_data)
WorldPacket data(SMSG_ITEM_NAME_QUERY_RESPONSE, (4 + 10)); WorldPacket data(SMSG_ITEM_NAME_QUERY_RESPONSE, (4 + 10));
data << uint32(pProto->ItemId); data << uint32(pProto->ItemId);
data << name; data << name;
data << uint32(pProto->InventoryType); //data << uint32(pProto->InventoryType); [-ZERO]
SendPacket(&data); SendPacket(&data);
return; return;
} }

View File

@ -38,11 +38,11 @@ enum MeetingstoneQueueStatus
enum MeetingstoneFailedStatus enum MeetingstoneFailedStatus
{ {
MEETINGSTONE_FAIL_NONE = 0, MEETINGSTONE_FAIL_NONE = 0, // custom, not to be sent
MEETINGSTONE_FAIL_PARTYLEADER = 1, MEETINGSTONE_FAIL_PARTYLEADER = 1,
MEETINGSTONE_FAIL_FULL_GROUP = 2, MEETINGSTONE_FAIL_FULL_GROUP = 2,
MEETINGSTONE_FAIL_RAID_GROUP = 3, MEETINGSTONE_FAIL_RAID_GROUP = 3,
MEETINGSTONE_FAIL_NONE_UNK = 4 //MEETINGSTONE_FAIL_NONE_UNK = 4 [-ZERO]
}; };
#endif #endif

View File

@ -1000,6 +1000,7 @@ void WorldSession::HandleInspectHonorStatsOpcode(WorldPacket& recv_data)
data << guid; // player guid data << guid; // player guid
// Rank, filling bar, PLAYER_BYTES_3, ?? // Rank, filling bar, PLAYER_BYTES_3, ??
data << (uint8)pl->GetByteValue(PLAYER_FIELD_BYTES2, 0); data << (uint8)pl->GetByteValue(PLAYER_FIELD_BYTES2, 0);
// FIXME: below must be 8*uint16, 6*uint32, uint8
// Today Honorable and Dishonorable Kills // Today Honorable and Dishonorable Kills
data << pl->GetUInt32Value(PLAYER_FIELD_SESSION_KILLS); data << pl->GetUInt32Value(PLAYER_FIELD_SESSION_KILLS);
// Yesterday Honorable Kills // Yesterday Honorable Kills