aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xsrc/server/game/Calendar/Calendar.cpp2
-rwxr-xr-xsrc/server/game/Calendar/Calendar.h6
-rw-r--r--src/server/game/Calendar/CalendarMgr.cpp2
-rw-r--r--src/server/game/Calendar/CalendarMgr.h2
-rwxr-xr-xsrc/server/game/Handlers/CalendarHandler.cpp86
-rwxr-xr-xsrc/server/game/Server/WorldSession.h34
6 files changed, 66 insertions, 66 deletions
diff --git a/src/server/game/Calendar/Calendar.cpp b/src/server/game/Calendar/Calendar.cpp
index ad0d4b4ac2e..3d6eef2cbab 100755
--- a/src/server/game/Calendar/Calendar.cpp
+++ b/src/server/game/Calendar/Calendar.cpp
@@ -74,7 +74,7 @@ void CalendarEvent::Init()
_dungeonId = -1;
_maxInvites = 0;
_eventTime = 0;
- _flags = (CalendarFlags) 0;
+ _flags = 0;
_repeatable = false;
_timezoneTime = 0;
_title = "";
diff --git a/src/server/game/Calendar/Calendar.h b/src/server/game/Calendar/Calendar.h
index 440a241652d..a2d2dc2ffb7 100755
--- a/src/server/game/Calendar/Calendar.h
+++ b/src/server/game/Calendar/Calendar.h
@@ -107,8 +107,8 @@ class CalendarEvent
void SetTime(uint32 eventTime) { _eventTime = eventTime; }
uint32 GetTime() const { return _eventTime; }
- void SetFlags(CalendarFlags flags) { _flags = flags; }
- CalendarFlags GetFlags() const { return _flags; }
+ void SetFlags(uint32 flags) { _flags = flags; }
+ uint32 GetFlags() const { return _flags; }
void SetRepeatable(bool repeatable) { _repeatable = repeatable; }
bool GetRepeatable() const { return _repeatable; }
@@ -140,7 +140,7 @@ class CalendarEvent
int32 _dungeonId;
uint32 _maxInvites;
uint32 _eventTime;
- CalendarFlags _flags;
+ uint32 _flags;
bool _repeatable;
uint32 _timezoneTime;
std::string _title;
diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp
index 9b8ef5614f0..ea420d88516 100644
--- a/src/server/game/Calendar/CalendarMgr.cpp
+++ b/src/server/game/Calendar/CalendarMgr.cpp
@@ -579,7 +579,7 @@ void CalendarMgr::SendCalendarEventInviteRemoveAlert(uint64 guid, CalendarEvent
player->GetSession()->SendCalendarEventInviteRemoveAlert(calendarEvent, status);
}
-void CalendarMgr::SendCalendarEventInviteRemove(uint64 guid, CalendarInvite const& invite, CalendarFlags flags)
+void CalendarMgr::SendCalendarEventInviteRemove(uint64 guid, CalendarInvite const& invite, uint32 flags)
{
if (Player* player = ObjectAccessor::FindPlayer(guid))
player->GetSession()->SendCalendarEventInviteRemove(invite, flags);
diff --git a/src/server/game/Calendar/CalendarMgr.h b/src/server/game/Calendar/CalendarMgr.h
index bfc0fd9d1cf..a8749778cb3 100644
--- a/src/server/game/Calendar/CalendarMgr.h
+++ b/src/server/game/Calendar/CalendarMgr.h
@@ -46,7 +46,7 @@ class CalendarMgr
void SendCalendarEvent(CalendarEvent const& calendarEvent, CalendarSendEventType type);
void SendCalendarEventInvite(CalendarInvite const& invite, bool pending);
void SendCalendarEventInviteAlert(CalendarEvent const& calendarEvent, CalendarInvite const& invite);
- void SendCalendarEventInviteRemove(uint64 guid, CalendarInvite const& invite, CalendarFlags flags);
+ void SendCalendarEventInviteRemove(uint64 guid, CalendarInvite const& invite, uint32 flags);
void SendCalendarEventInviteRemoveAlert(uint64 guid, CalendarEvent const& calendarEvent, CalendarInviteStatus status);
void SendCalendarEventUpdateAlert(uint64 guid, CalendarEvent const& calendarEvent, CalendarSendEventType type);
void SendCalendarEventStatus(uint64 guid, CalendarEvent const& calendarEvent, CalendarInvite const& invite);
diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp
index f9e74b60c58..b5bff0e710a 100755
--- a/src/server/game/Handlers/CalendarHandler.cpp
+++ b/src/server/game/Handlers/CalendarHandler.cpp
@@ -45,7 +45,7 @@ SMSG_CALENDAR_EVENT_INVITE_STATUS_ALERT [ Structure unkown ]
#include "ObjectAccessor.h"
#include "DatabaseEnv.h"
-void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recv_data*/)
+void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recvData*/)
{
uint64 guid = _player->GetGUID();
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_CALENDAR_GET_CALENDAR [" UI64FMTD "]", guid);
@@ -177,10 +177,10 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recv_data*/)
SendPacket(&data);
}
-void WorldSession::HandleCalendarGetEvent(WorldPacket& recv_data)
+void WorldSession::HandleCalendarGetEvent(WorldPacket& recvData)
{
uint64 eventId;
- recv_data >> eventId;
+ recvData >> eventId;
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_CALENDAR_GET_EVENT. Event: ["
UI64FMTD "] Event [" UI64FMTD "]", _player->GetGUID(), eventId);
@@ -189,21 +189,21 @@ void WorldSession::HandleCalendarGetEvent(WorldPacket& recv_data)
SendCalendarEvent(*calendarEvent, CALENDAR_SENDTYPE_GET);
}
-void WorldSession::HandleCalendarGuildFilter(WorldPacket& recv_data)
+void WorldSession::HandleCalendarGuildFilter(WorldPacket& recvData)
{
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_CALENDAR_GUILD_FILTER [" UI64FMTD "]", _player->GetGUID());
- recv_data.read_skip<uint32>(); // unk1
- recv_data.read_skip<uint32>(); // unk2
- recv_data.read_skip<uint32>(); // level
+ recvData.read_skip<uint32>(); // unk1
+ recvData.read_skip<uint32>(); // unk2
+ recvData.read_skip<uint32>(); // level
}
-void WorldSession::HandleCalendarArenaTeam(WorldPacket& recv_data)
+void WorldSession::HandleCalendarArenaTeam(WorldPacket& recvData)
{
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_CALENDAR_ARENA_TEAM [" UI64FMTD "]", _player->GetGUID());
- recv_data.read_skip<uint32>(); // unk
+ recvData.read_skip<uint32>(); // unk
}
-void WorldSession::HandleCalendarAddEvent(WorldPacket& recv_data)
+void WorldSession::HandleCalendarAddEvent(WorldPacket& recvData)
{
uint64 guid = _player->GetGUID();
std::string title;
@@ -220,15 +220,15 @@ void WorldSession::HandleCalendarAddEvent(WorldPacket& recv_data)
uint8 status;
uint8 rank;
- recv_data >> title >> description >> type >> repeatable >> maxInvites;
- recv_data >> dungeonId >> eventPackedTime >> unkPackedTime >> flags;
+ recvData >> title >> description >> type >> repeatable >> maxInvites;
+ recvData >> dungeonId >> eventPackedTime >> unkPackedTime >> flags;
if (!(flags & CALENDAR_FLAG_WITHOUT_INVITES))
{
uint32 inviteCount;
- recv_data >> inviteCount;
- recv_data.readPackGUID(invitee);
- recv_data >> status >> rank;
+ recvData >> inviteCount;
+ recvData.readPackGUID(invitee);
+ recvData >> status >> rank;
if (inviteCount != 1 || invitee != guid)
{
@@ -261,7 +261,7 @@ void WorldSession::HandleCalendarAddEvent(WorldPacket& recv_data)
action.Event.SetEventId(sCalendarMgr->GetFreeEventId());
action.Event.SetCreatorGUID(guid);
action.Event.SetType((CalendarEventType) type);
- action.Event.SetFlags((CalendarFlags) flags);
+ action.Event.SetFlags(flags);
action.Event.SetTime(eventPackedTime);
action.Event.SetTimeZoneTime(unkPackedTime);
action.Event.SetRepeatable(repeatable);
@@ -281,7 +281,7 @@ void WorldSession::HandleCalendarAddEvent(WorldPacket& recv_data)
sCalendarMgr->AddAction(action);
}
-void WorldSession::HandleCalendarUpdateEvent(WorldPacket& recv_data)
+void WorldSession::HandleCalendarUpdateEvent(WorldPacket& recvData)
{
uint64 guid = _player->GetGUID();
uint64 eventId;
@@ -296,9 +296,9 @@ void WorldSession::HandleCalendarUpdateEvent(WorldPacket& recv_data)
uint32 timeZoneTime;
uint32 flags;
- recv_data >> eventId >> inviteId >> title >> description >> type;
- recv_data >> repeatable >> maxInvites >> dungeonId;
- recv_data >> eventPackedTime >> timeZoneTime >> flags;
+ recvData >> eventId >> inviteId >> title >> description >> type;
+ recvData >> repeatable >> maxInvites >> dungeonId;
+ recvData >> eventPackedTime >> timeZoneTime >> flags;
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_CALENDAR_UPDATE_EVENT [" UI64FMTD "] EventId [" UI64FMTD
"], InviteId [" UI64FMTD "] Title %s, Description %s, type %u "
@@ -325,14 +325,14 @@ void WorldSession::HandleCalendarUpdateEvent(WorldPacket& recv_data)
sCalendarMgr->AddAction(action);
}
-void WorldSession::HandleCalendarRemoveEvent(WorldPacket& recv_data)
+void WorldSession::HandleCalendarRemoveEvent(WorldPacket& recvData)
{
uint64 guid = _player->GetGUID();
uint64 eventId;
uint64 inviteId;
uint32 flags;
- recv_data >> eventId >> inviteId >> flags;
+ recvData >> eventId >> inviteId >> flags;
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_CALENDAR_REMOVE_EVENT [" UI64FMTD "], EventId [" UI64FMTD
"] inviteId [" UI64FMTD "] Flags?: %u", guid, eventId, inviteId, flags);
@@ -346,14 +346,14 @@ void WorldSession::HandleCalendarRemoveEvent(WorldPacket& recv_data)
sCalendarMgr->AddAction(action);
}
-void WorldSession::HandleCalendarCopyEvent(WorldPacket& recv_data)
+void WorldSession::HandleCalendarCopyEvent(WorldPacket& recvData)
{
uint64 guid = _player->GetGUID();
uint64 eventId;
uint64 inviteId;
uint32 time;
- recv_data >> eventId >> inviteId >> time;
+ recvData >> eventId >> inviteId >> time;
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_CALENDAR_COPY_EVENT [" UI64FMTD "], EventId [" UI64FMTD
"] inviteId [" UI64FMTD "] Time: %u", guid, eventId, inviteId, time);
@@ -367,7 +367,7 @@ void WorldSession::HandleCalendarCopyEvent(WorldPacket& recv_data)
sCalendarMgr->AddAction(action);
}
-void WorldSession::HandleCalendarEventInvite(WorldPacket& recv_data)
+void WorldSession::HandleCalendarEventInvite(WorldPacket& recvData)
{
uint64 guid = _player->GetGUID();
uint64 eventId;
@@ -378,7 +378,7 @@ void WorldSession::HandleCalendarEventInvite(WorldPacket& recv_data)
uint64 invitee = 0;
uint32 team = 0;
- recv_data >> eventId >> inviteId >> name >> status >> rank;
+ recvData >> eventId >> inviteId >> name >> status >> rank;
if (Player* player = sObjectAccessor->FindPlayerByName(name.c_str()))
{
invitee = player->GetGUID();
@@ -428,13 +428,13 @@ void WorldSession::HandleCalendarEventInvite(WorldPacket& recv_data)
sCalendarMgr->AddAction(action);
}
-void WorldSession::HandleCalendarEventSignup(WorldPacket& recv_data)
+void WorldSession::HandleCalendarEventSignup(WorldPacket& recvData)
{
uint64 guid = _player->GetGUID();
uint64 eventId;
uint8 status;
- recv_data >> eventId >> status;
+ recvData >> eventId >> status;
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_CALENDAR_EVENT_SIGNUP [" UI64FMTD "] EventId ["
UI64FMTD "] Status %u", guid, eventId, status);
@@ -447,14 +447,14 @@ void WorldSession::HandleCalendarEventSignup(WorldPacket& recv_data)
sCalendarMgr->AddAction(action);
}
-void WorldSession::HandleCalendarEventRsvp(WorldPacket& recv_data)
+void WorldSession::HandleCalendarEventRsvp(WorldPacket& recvData)
{
uint64 guid = _player->GetGUID();
uint64 eventId;
uint64 inviteId;
uint8 status;
- recv_data >> eventId >> inviteId >> status;
+ recvData >> eventId >> inviteId >> status;
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_CALENDAR_EVENT_RSVP [" UI64FMTD"] EventId ["
UI64FMTD "], InviteId [" UI64FMTD "], status %u", guid, eventId,
inviteId, status);
@@ -470,7 +470,7 @@ void WorldSession::HandleCalendarEventRsvp(WorldPacket& recv_data)
sCalendarMgr->AddAction(action);
}
-void WorldSession::HandleCalendarEventRemoveInvite(WorldPacket& recv_data)
+void WorldSession::HandleCalendarEventRemoveInvite(WorldPacket& recvData)
{
uint64 guid = _player->GetGUID();
uint64 invitee;
@@ -478,8 +478,8 @@ void WorldSession::HandleCalendarEventRemoveInvite(WorldPacket& recv_data)
uint64 owninviteId;
uint64 inviteId;
- recv_data.readPackGUID(invitee);
- recv_data >> inviteId >> owninviteId >> eventId;
+ recvData.readPackGUID(invitee);
+ recvData >> inviteId >> owninviteId >> eventId;
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_CALENDAR_EVENT_REMOVE_INVITE ["
UI64FMTD "] EventId [" UI64FMTD "], OwnInviteId ["
@@ -497,7 +497,7 @@ void WorldSession::HandleCalendarEventRemoveInvite(WorldPacket& recv_data)
sCalendarMgr->AddAction(action);
}
-void WorldSession::HandleCalendarEventStatus(WorldPacket& recv_data)
+void WorldSession::HandleCalendarEventStatus(WorldPacket& recvData)
{
uint64 guid = _player->GetGUID();
uint64 invitee;
@@ -506,8 +506,8 @@ void WorldSession::HandleCalendarEventStatus(WorldPacket& recv_data)
uint64 owninviteId;
uint8 status;
- recv_data.readPackGUID(invitee);
- recv_data >> eventId >> inviteId >> owninviteId >> status;
+ recvData.readPackGUID(invitee);
+ recvData >> eventId >> inviteId >> owninviteId >> status;
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_CALENDAR_EVENT_STATUS [" UI64FMTD"] EventId ["
UI64FMTD "] OwnInviteId [" UI64FMTD "], Invitee ([" UI64FMTD "] id: ["
UI64FMTD "], status %u", guid, eventId, owninviteId, invitee, inviteId, status);
@@ -524,7 +524,7 @@ void WorldSession::HandleCalendarEventStatus(WorldPacket& recv_data)
sCalendarMgr->AddAction(action);
}
-void WorldSession::HandleCalendarEventModeratorStatus(WorldPacket& recv_data)
+void WorldSession::HandleCalendarEventModeratorStatus(WorldPacket& recvData)
{
uint64 guid = _player->GetGUID();
uint64 invitee;
@@ -533,8 +533,8 @@ void WorldSession::HandleCalendarEventModeratorStatus(WorldPacket& recv_data)
uint64 owninviteId;
uint8 status;
- recv_data.readPackGUID(invitee);
- recv_data >> eventId >> inviteId >> owninviteId >> status;
+ recvData.readPackGUID(invitee);
+ recvData >> eventId >> inviteId >> owninviteId >> status;
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_CALENDAR_EVENT_MODERATOR_STATUS [" UI64FMTD "] EventId ["
UI64FMTD "] OwnInviteId [" UI64FMTD "], Invitee ([" UI64FMTD "] id: ["
UI64FMTD "], status %u", guid, eventId, owninviteId, invitee, inviteId, status);
@@ -551,18 +551,18 @@ void WorldSession::HandleCalendarEventModeratorStatus(WorldPacket& recv_data)
sCalendarMgr->AddAction(action);
}
-void WorldSession::HandleCalendarComplain(WorldPacket& recv_data)
+void WorldSession::HandleCalendarComplain(WorldPacket& recvData)
{
uint64 guid = _player->GetGUID();
uint64 eventId;
uint64 complainGUID;
- recv_data >> eventId >> complainGUID;
+ recvData >> eventId >> complainGUID;
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_CALENDAR_COMPLAIN [" UI64FMTD "] EventId ["
UI64FMTD "] guid [" UI64FMTD "]", guid, eventId, complainGUID);
}
-void WorldSession::HandleCalendarGetNumPending(WorldPacket& /*recv_data*/)
+void WorldSession::HandleCalendarGetNumPending(WorldPacket& /*recvData*/)
{
uint64 guid = _player->GetGUID();
uint32 pending = sCalendarMgr->GetPlayerNumPending(guid);
@@ -798,7 +798,7 @@ void WorldSession::SendCalendarEventInviteRemoveAlert(CalendarEvent const& calen
SendPacket(&data);
}
-void WorldSession::SendCalendarEventInviteRemove(CalendarInvite const& invite, CalendarFlags flags)
+void WorldSession::SendCalendarEventInviteRemove(CalendarInvite const& invite, uint32 flags)
{
uint64 guid = _player->GetGUID();
uint64 eventId = invite.GetEventId();
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index 3158c02a320..703c37c35a8 100755
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -865,27 +865,27 @@ class WorldSession
void HandleAcceptGrantLevel(WorldPacket& recv_data);
// Calendar
- void HandleCalendarGetCalendar(WorldPacket& recv_data);
- void HandleCalendarGetEvent(WorldPacket& recv_data);
- void HandleCalendarGuildFilter(WorldPacket& recv_data);
- void HandleCalendarArenaTeam(WorldPacket& recv_data);
- void HandleCalendarAddEvent(WorldPacket& recv_data);
- void HandleCalendarUpdateEvent(WorldPacket& recv_data);
- void HandleCalendarRemoveEvent(WorldPacket& recv_data);
- void HandleCalendarCopyEvent(WorldPacket& recv_data);
- void HandleCalendarEventInvite(WorldPacket& recv_data);
- void HandleCalendarEventRsvp(WorldPacket& recv_data);
- void HandleCalendarEventRemoveInvite(WorldPacket& recv_data);
- void HandleCalendarEventStatus(WorldPacket& recv_data);
- void HandleCalendarEventModeratorStatus(WorldPacket& recv_data);
- void HandleCalendarComplain(WorldPacket& recv_data);
- void HandleCalendarGetNumPending(WorldPacket& recv_data);
- void HandleCalendarEventSignup(WorldPacket& recv_data);
+ void HandleCalendarGetCalendar(WorldPacket& recvData);
+ void HandleCalendarGetEvent(WorldPacket& recvData);
+ void HandleCalendarGuildFilter(WorldPacket& recvData);
+ void HandleCalendarArenaTeam(WorldPacket& recvData);
+ void HandleCalendarAddEvent(WorldPacket& recvData);
+ void HandleCalendarUpdateEvent(WorldPacket& recvData);
+ void HandleCalendarRemoveEvent(WorldPacket& recvData);
+ void HandleCalendarCopyEvent(WorldPacket& recvData);
+ void HandleCalendarEventInvite(WorldPacket& recvData);
+ void HandleCalendarEventRsvp(WorldPacket& recvData);
+ void HandleCalendarEventRemoveInvite(WorldPacket& recvData);
+ void HandleCalendarEventStatus(WorldPacket& recvData);
+ void HandleCalendarEventModeratorStatus(WorldPacket& recvData);
+ void HandleCalendarComplain(WorldPacket& recvData);
+ void HandleCalendarGetNumPending(WorldPacket& recvData);
+ void HandleCalendarEventSignup(WorldPacket& recvData);
void SendCalendarEvent(CalendarEvent const& calendarEvent, CalendarSendEventType sendEventType);
void SendCalendarEventInvite(CalendarInvite const& invite, bool pending);
void SendCalendarEventInviteAlert(CalendarEvent const& calendarEvent, CalendarInvite const& calendarInvite);
- void SendCalendarEventInviteRemove(CalendarInvite const& invite, CalendarFlags flags);
+ void SendCalendarEventInviteRemove(CalendarInvite const& invite, uint32 flags);
void SendCalendarEventInviteRemoveAlert(CalendarEvent const& calendarEvent, CalendarInviteStatus status);
void SendCalendarEventRemovedAlert(CalendarEvent const& calendarEvent);
void SendCalendarEventUpdateAlert(CalendarEvent const& calendarEvent, CalendarSendEventType sendEventType);