diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index fbbd364aa..f7b63774d 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -723,29 +723,29 @@ void WorldSession::HandleResurrectResponseOpcode(WorldPacket & recv_data) void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data) { - CHECK_PACKET_SIZE(recv_data,4); + CHECK_PACKET_SIZE(recv_data, 4); sLog.outDebug("WORLD: Received CMSG_AREATRIGGER"); uint32 Trigger_ID; recv_data >> Trigger_ID; - sLog.outDebug("Trigger ID:%u",Trigger_ID); + sLog.outDebug("Trigger ID: %u", Trigger_ID); if(GetPlayer()->isInFlight()) { - sLog.outDebug("Player '%s' (GUID: %u) in flight, ignore Area Trigger ID:%u",GetPlayer()->GetName(),GetPlayer()->GetGUIDLow(), Trigger_ID); + sLog.outDebug("Player '%s' (GUID: %u) in flight, ignore Area Trigger ID: %u", GetPlayer()->GetName(), GetPlayer()->GetGUIDLow(), Trigger_ID); return; } AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID); if(!atEntry) { - sLog.outDebug("Player '%s' (GUID: %u) send unknown (by DBC) Area Trigger ID:%u",GetPlayer()->GetName(),GetPlayer()->GetGUIDLow(), Trigger_ID); + sLog.outDebug("Player '%s' (GUID: %u) send unknown (by DBC) Area Trigger ID: %u", GetPlayer()->GetName(), GetPlayer()->GetGUIDLow(), Trigger_ID); return; } - if (GetPlayer()->GetMapId()!=atEntry->mapid) + if (GetPlayer()->GetMapId() != atEntry->mapid) { sLog.outDebug("Player '%s' (GUID: %u) too far (trigger map: %u player map: %u), ignore Area Trigger ID: %u", GetPlayer()->GetName(), atEntry->mapid, GetPlayer()->GetMapId(), GetPlayer()->GetGUIDLow(), Trigger_ID); return; @@ -759,7 +759,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data) if (atEntry->radius > 0) { // if we have radius check it - float dist = pl->GetDistance(atEntry->x,atEntry->y,atEntry->z); + float dist = pl->GetDistance(atEntry->x, atEntry->y, atEntry->z); if(dist > atEntry->radius + delta) { sLog.outDebug("Player '%s' (GUID: %u) too far (radius: %f distance: %f), ignore Area Trigger ID: %u", @@ -888,7 +888,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data) } } - GetPlayer()->TeleportTo(at->target_mapId,at->target_X,at->target_Y,at->target_Z,at->target_Orientation,TELE_TO_NOT_LEAVE_TRANSPORT); + GetPlayer()->TeleportTo(at->target_mapId, at->target_X, at->target_Y, at->target_Z, at->target_Orientation, TELE_TO_NOT_LEAVE_TRANSPORT); } void WorldSession::HandleUpdateAccountData(WorldPacket &recv_data) diff --git a/src/game/Player.h b/src/game/Player.h index bbe948c25..80cdf36d9 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -169,7 +169,7 @@ struct ActionButton } }; -#define MAX_ACTION_BUTTONS 144 //checked in 2.3.0 +#define MAX_ACTION_BUTTONS 144 //checked in 3.2.0 typedef std::map ActionButtonList; @@ -316,20 +316,24 @@ typedef std::list ItemDurationList; enum LfgType { - LFG_TYPE_NONE = 0, - LFG_TYPE_DUNGEON = 1, - LFG_TYPE_RAID = 2, - LFG_TYPE_QUEST = 3, - LFG_TYPE_ZONE = 4, - LFG_TYPE_HEROIC_DUNGEON = 5 + LFG_TYPE_NONE = 0, + LFG_TYPE_DUNGEON = 1, + LFG_TYPE_RAID = 2, + LFG_TYPE_QUEST = 3, + LFG_TYPE_ZONE = 4, + LFG_TYPE_HEROIC_DUNGEON = 5, + LFG_TYPE_ANY_DUNGEON = 6, + LFG_TYPE_ANY_HEROIC_DUNGEON = 7, + LFG_TYPE_DAILY_DUNGEON = 8, + LFG_TYPE_DAILY_HEROIC_DUNGEON = 9 }; enum LfgRoles { - LEADER = 1, - TANK = 2, - HEALER = 4, - DAMAGE = 8 + LEADER = 0x01, + TANK = 0x02, + HEALER = 0x04, + DAMAGE = 0x08 }; struct LookingForGroupSlot diff --git a/src/game/UpdateFields.h b/src/game/UpdateFields.h index 0efc3d2be..b0ca0a28d 100644 --- a/src/game/UpdateFields.h +++ b/src/game/UpdateFields.h @@ -19,7 +19,7 @@ #ifndef _UPDATEFIELDS_AUTO_H #define _UPDATEFIELDS_AUTO_H -// Auto generated for version 0, 2, 0, 10048 +// Auto generated for version 0, 2, 0, 10072 enum EObjectFields { diff --git a/src/realmd/AuthCodes.h b/src/realmd/AuthCodes.h index dcf53e248..9d42727bd 100644 --- a/src/realmd/AuthCodes.h +++ b/src/realmd/AuthCodes.h @@ -66,8 +66,8 @@ enum LoginResult // we need to stick to 1 version or half of the stuff will work for someone // others will not and opposite -// will only support WoW, WoW:TBC and WoW:WotLK 3.2.0 client build 10048... +// will only support WoW, WoW:TBC and WoW:WotLK 3.2.0 client build 10072... -#define EXPECTED_MANGOS_CLIENT_BUILD {10048, 0} +#define EXPECTED_MANGOS_CLIENT_BUILD {10072, 0} #endif