diff options
Diffstat (limited to 'src/server/game/Calendar/CalendarMgr.cpp')
| -rw-r--r-- | src/server/game/Calendar/CalendarMgr.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp index 4e86fdd1775..08a406c4f15 100644 --- a/src/server/game/Calendar/CalendarMgr.cpp +++ b/src/server/game/Calendar/CalendarMgr.cpp @@ -17,12 +17,15 @@ #include "CalendarMgr.h" #include "CharacterCache.h" -#include "QueryResult.h" -#include "Log.h" -#include "Player.h" +#include "DatabaseEnv.h" +#include "Guild.h" #include "GuildMgr.h" +#include "Log.h" +#include "Mail.h" #include "ObjectAccessor.h" #include "Opcodes.h" +#include "Player.h" +#include "WorldPacket.h" CalendarInvite::~CalendarInvite() { @@ -297,7 +300,7 @@ CalendarEvent* CalendarMgr::GetEvent(uint64 eventId) const return *itr; TC_LOG_DEBUG("calendar", "CalendarMgr::GetEvent: [" UI64FMTD "] not found!", eventId); - return NULL; + return nullptr; } CalendarInvite* CalendarMgr::GetInvite(uint64 inviteId) const @@ -308,7 +311,7 @@ CalendarInvite* CalendarMgr::GetInvite(uint64 inviteId) const return *itr2; TC_LOG_DEBUG("calendar", "CalendarMgr::GetInvite: [" UI64FMTD "] not found!", inviteId); - return NULL; + return nullptr; } void CalendarMgr::FreeEventId(uint64 id) @@ -618,7 +621,7 @@ void CalendarMgr::SendCalendarClearPendingAction(ObjectGuid guid) } } -void CalendarMgr::SendCalendarCommandResult(ObjectGuid guid, CalendarError err, char const* param /*= NULL*/) +void CalendarMgr::SendCalendarCommandResult(ObjectGuid guid, CalendarError err, char const* param /*= nullptr*/) { if (Player* player = ObjectAccessor::FindConnectedPlayer(guid)) { |