From 9506fd77fcb560c2f6aeb6830fb7e32e6c813027 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Mon, 14 Jul 2014 01:07:30 +0200 Subject: Core: Fix warnings vs2014 ctp (no support) --- src/server/game/Calendar/CalendarMgr.cpp | 4 ++-- src/server/game/Entities/Player/Player.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp index a4cb972e625..03d65fb134d 100644 --- a/src/server/game/Calendar/CalendarMgr.cpp +++ b/src/server/game/Calendar/CalendarMgr.cpp @@ -441,8 +441,8 @@ void CalendarMgr::SendCalendarEventInvite(CalendarInvite const& invite) if (!calendarEvent) // Pre-invite { - if (Player* player = ObjectAccessor::FindPlayer(invite.GetSenderGUID())) - player->SendDirectMessage(&data); + if (Player* playerSender = ObjectAccessor::FindPlayer(invite.GetSenderGUID())) + playerSender->SendDirectMessage(&data); } else { diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 1c15aebbaba..10b8e5ffc06 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -17537,7 +17537,6 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) if (!map) { - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); mapId = info->mapId; Relocate(info->positionX, info->positionY, info->positionZ, 0.0f); map = sMapMgr->CreateMap(mapId, this); -- cgit v1.2.3