more c++11 standarts income

This commit is contained in:
sanctum32 2015-02-04 10:32:32 +00:00 committed by Antz
parent cdefc77c45
commit 72d9521c8a

View file

@ -64,7 +64,7 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recv_data*/)
data << uint8(event->IsGuildEvent());
data << event->CreatorGuid.WriteAsPacked();
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "invite> EventId["UI64FMTD"], InviteId["UI64FMTD"], status[%u], rank[%u]",
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "invite> EventId[" UI64FMTD "], InviteId[" UI64FMTD "], status[%u], rank[%u]",
event->EventId, (*itr)->InviteId, uint32((*itr)->Status), uint32((*itr)->Rank));
}
@ -87,7 +87,7 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recv_data*/)
data << event->CreatorGuid.WriteAsPacked();
std::string timeStr = TimeToTimestampStr(event->EventTime);
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "Events> EventId["UI64FMTD"], Title[%s], Time[%s], Type[%u], Flag[%u], DungeonId[%d], CreatorGuid[%s]",
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "Events> EventId[" UI64FMTD "], Title[%s], Time[%s], Type[%u], Flag[%u], DungeonId[%d], CreatorGuid[%s]",
event->EventId, event->Title.c_str(), timeStr.c_str(), uint32(event->Type),
uint32(event->Flags), event->DungeonId, event->CreatorGuid.GetString().c_str());
}
@ -227,7 +227,7 @@ void WorldSession::HandleCalendarEventSignup(WorldPacket& recv_data)
recv_data >> eventId;
recv_data >> tentative; // uint8 == bool size in all compilator???
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD"] Tentative %u", eventId, uint32(tentative));
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "] Tentative %u", eventId, uint32(tentative));
if (CalendarEvent* event = sCalendarMgr.GetEventById(eventId))
{
@ -333,7 +333,7 @@ void WorldSession::HandleCalendarUpdateEvent(WorldPacket& recv_data)
recv_data >> UnknownPackedTime;
recv_data >> flags;
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD"], InviteId ["UI64FMTD"] Title %s, Description %s, type %u "
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "], InviteId [" UI64FMTD "] Title %s, Description %s, type %u "
"Repeatable %u, MaxInvites %u, Dungeon ID %d, Flags %u", eventId, inviteId, title.c_str(),
description.c_str(), uint32(type), uint32(repetitionType), maxInvites, dungeonId, flags);
@ -406,7 +406,7 @@ void WorldSession::HandleCalendarCopyEvent(WorldPacket& recv_data)
recv_data >> eventId >> inviteId;
recv_data >> packedTime;
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD"] inviteId ["UI64FMTD"]",
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "] inviteId [" UI64FMTD "]",
eventId, inviteId);
sCalendarMgr.CopyEvent(eventId, timeBitFieldsToSecs(packedTime), guid);
@ -587,7 +587,7 @@ void WorldSession::HandleCalendarEventRemoveInvite(WorldPacket& recv_data)
recv_data >> invitee.ReadAsPacked();
recv_data >> inviteId >> ownerInviteId >> eventId;
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD"], ownerInviteId ["UI64FMTD"], Invitee ([%s] id: ["UI64FMTD"])",
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "], ownerInviteId [" UI64FMTD "], Invitee ([%s] id: [" UI64FMTD "])",
eventId, ownerInviteId, invitee.GetString().c_str(), inviteId);
if (CalendarEvent* event = sCalendarMgr.GetEventById(eventId))
@ -610,7 +610,7 @@ void WorldSession::HandleCalendarEventStatus(WorldPacket& recv_data)
recv_data >> invitee.ReadAsPacked();
recv_data >> eventId >> inviteId >> ownerInviteId >> status;
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD"] ownerInviteId ["UI64FMTD"], Invitee ([%s] id: ["UI64FMTD"], status %u",
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "] ownerInviteId [" UI64FMTD "], Invitee ([%s] id: [" UI64FMTD "], status %u",
eventId, ownerInviteId, invitee.GetString().c_str(), inviteId, status);
if (CalendarEvent* event = sCalendarMgr.GetEventById(eventId))
@ -660,7 +660,7 @@ void WorldSession::HandleCalendarEventModeratorStatus(WorldPacket& recv_data)
recv_data >> invitee.ReadAsPacked();
recv_data >> eventId >> inviteId >> ownerInviteId >> rank;
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD"] ownerInviteId ["UI64FMTD"], Invitee ([%s] id: ["UI64FMTD"], rank %u",
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "] ownerInviteId [" UI64FMTD "], Invitee ([%s] id: [" UI64FMTD "], rank %u",
eventId, ownerInviteId, invitee.GetString().c_str(), inviteId, rank);
if (CalendarEvent* event = sCalendarMgr.GetEventById(eventId))
@ -712,7 +712,7 @@ void WorldSession::HandleCalendarComplain(WorldPacket& recv_data)
recv_data >> badGuyGuid;
recv_data >> eventId >> inviteId;
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD"], BadGuyGuid ([%s] inviteId: ["UI64FMTD"])",
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "], BadGuyGuid ([%s] inviteId: [" UI64FMTD "])",
eventId, badGuyGuid.GetString().c_str(), inviteId);
// Remove the invite
@ -765,7 +765,7 @@ void CalendarMgr::SendCalendarEventInviteAlert(CalendarInvite const* invite)
data << invite->SenderGuid.WriteAsPacked();
//data.hexlike();
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SendCalendarInviteAlert> senderGuid[%s], inviteeGuid[%s], EventId["UI64FMTD"], Status[%u], InviteId["UI64FMTD"]",
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SendCalendarInviteAlert> senderGuid[%s], inviteeGuid[%s], EventId[" UI64FMTD "], Status[%u], InviteId[" UI64FMTD "]",
invite->SenderGuid.GetString().c_str(), invite->InviteeGuid.GetString().c_str(), event->EventId, uint32(invite->Status), invite->InviteId);
if (event->IsGuildEvent() || event->IsGuildAnnouncement())
@ -805,7 +805,7 @@ void CalendarMgr::SendCalendarEventInvite(CalendarInvite const* invite)
data << secsToTimeBitFields(statusTime);
data << uint8(invite->SenderGuid != invite->InviteeGuid); // false only if the invite is sign-up (invitee create himself his invite)
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SendCalendarInvit> %s senderGuid[%s], inviteeGuid[%s], EventId["UI64FMTD"], Status[%u], InviteId["UI64FMTD"]",
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SendCalendarInvit> %s senderGuid[%s], inviteeGuid[%s], EventId[" UI64FMTD "], Status[%u], InviteId[" UI64FMTD "]",
preInvite ? "is PreInvite," : "", invite->SenderGuid.GetString().c_str(), invite->InviteeGuid.GetString().c_str(), eventId, uint32(invite->Status), invite->InviteId);
//data.hexlike();
@ -861,7 +861,7 @@ void CalendarMgr::SendCalendarEvent(Player* player, CalendarEvent const* event,
return;
std::string timeStr = TimeToTimestampStr(event->EventTime);
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SendCalendarEvent> sendType[%u], CreatorGuid[%s], EventId["UI64FMTD"], Type[%u], Flags[%u], Title[%s]",
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SendCalendarEvent> sendType[%u], CreatorGuid[%s], EventId[" UI64FMTD "], Type[%u], Flags[%u], Title[%s]",
sendType, event->CreatorGuid.GetString().c_str(), event->EventId, uint32(event->Type), event->Flags, event->Title.c_str());
WorldPacket data(SMSG_CALENDAR_SEND_EVENT);
@ -899,7 +899,7 @@ void CalendarMgr::SendCalendarEvent(Player* player, CalendarEvent const* event,
data << secsToTimeBitFields(invite->LastUpdateTime);
data << invite->Text;
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "Invite> InviteId["UI64FMTD"], InviteLvl[%u], Status[%u], Rank[%u], GuildEvent[%s], Text[%s]",
DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "Invite> InviteId[" UI64FMTD "], InviteLvl[%u], Status[%u], Rank[%u], GuildEvent[%s], Text[%s]",
invite->InviteId, uint32(inviteeLevel), uint32(invite->Status), uint32(invite->Rank),
(event->IsGuildEvent() && event->GuildId == inviteeGuildId) ? "true" : "false", invite->Text.c_str());
}