josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Corrected conflicting variable names

Browse Source
This commit is contained in:
Shauren
2012-03-14 00:21:46 +01:00
parent ae27a2cf51
commit 1dde22394c
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Calendar/CalendarMgr.cpp
+2 -2
View File
@@ -469,9 +469,9 @@ bool CalendarMgr::RemoveEvent(uint64 eventId)
bool val = true; bool val = true;
CalendarInviteIdList const& invites = itr->second.GetInviteIdList(); CalendarInviteIdList const& invites = itr->second.GetInviteIdList();
for (CalendarInviteIdList::const_iterator itr = invites.begin(); itr != invites.end(); ++itr) for (CalendarInviteIdList::const_iterator itrInvites = invites.begin(); itrInvites != invites.end(); ++itrInvites)
{ {
CalendarInvite* invite = GetInvite(*itr); CalendarInvite* invite = GetInvite(*itrInvites);
if (!invite || !RemovePlayerEvent(invite->GetInvitee(), eventId)) if (!invite || !RemovePlayerEvent(invite->GetInvitee(), eventId))
val = false; val = false;
} }
src/server/game/Entities/Player/Player.cpp
+1 -1
View File
@@ -4079,7 +4079,7 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank)
// most likely will never be used, haven't heard of cases where players unlearn a mount // most likely will never be used, haven't heard of cases where players unlearn a mount
if (Has310Flyer(false) && _spell_idx->second->skillId == SKILL_MOUNTS) if (Has310Flyer(false) && _spell_idx->second->skillId == SKILL_MOUNTS)
{ {
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spell_id); if (spellInfo)
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
if (spellInfo->Effects[i].ApplyAuraName == SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED && if (spellInfo->Effects[i].ApplyAuraName == SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED &&
spellInfo->Effects[i].CalcValue() == 310) spellInfo->Effects[i].CalcValue() == 310)
src/server/game/Handlers/CalendarHandler.cpp
+2 -3
View File
@@ -590,11 +590,10 @@ void WorldSession::HandleCalendarGetNumPending(WorldPacket& /*recvData*/)
void WorldSession::SendCalendarEvent(CalendarEvent const& calendarEvent, CalendarSendEventType sendEventType) void WorldSession::SendCalendarEvent(CalendarEvent const& calendarEvent, CalendarSendEventType sendEventType)
{ {
uint64 guid = _player->GetGUID();
uint64 eventId = calendarEvent.GetEventId(); uint64 eventId = calendarEvent.GetEventId();
sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_CALENDAR_SEND_EVENT [" UI64FMTD "] EventId [" sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_CALENDAR_SEND_EVENT [" UI64FMTD "] EventId ["
UI64FMTD "] SendType %u", guid, eventId, sendEventType); UI64FMTD "] SendType %u", _player->GetGUID(), eventId, sendEventType);
WorldPacket data(SMSG_CALENDAR_SEND_EVENT); WorldPacket data(SMSG_CALENDAR_SEND_EVENT);
data << uint8(sendEventType); data << uint8(sendEventType);
@@ -632,7 +631,7 @@ void WorldSession::SendCalendarEvent(CalendarEvent const& calendarEvent, Calenda
} }
else else
{ {
data.appendPackGUID(guid); data.appendPackGUID(_player->GetGUID());
data << uint8(0) << uint8(0) << uint8(0) << uint8(0) data << uint8(0) << uint8(0) << uint8(0) << uint8(0)
<< uint64(0) << uint32(0) << uint8(0); << uint64(0) << uint32(0) << uint8(0);