diff options
| author | Gustavo <sirikfoll@hotmail.com> | 2016-08-28 20:11:04 -0300 |
|---|---|---|
| committer | Aokromes <Aokromes@users.noreply.github.com> | 2016-08-29 01:11:04 +0200 |
| commit | 6ee35734e42a97696056fcb0bf684a11ea4e524c (patch) | |
| tree | 67e44ac76a88c007034d1421b298bd7175b8ebfc /src/server/game | |
| parent | 6947017200f9ea3ac811614e8854266652ffa985 (diff) | |
Whitespace clean-up
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Entities/Player/CinematicMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Handlers/QuestHandler.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Entities/Player/CinematicMgr.cpp b/src/server/game/Entities/Player/CinematicMgr.cpp index cc5a62300ad..87e92495659 100644 --- a/src/server/game/Entities/Player/CinematicMgr.cpp +++ b/src/server/game/Entities/Player/CinematicMgr.cpp @@ -163,7 +163,7 @@ void CinematicMgr::UpdateCinematicLocation(uint32 /*diff*/) Position interPosition(lastPosition.m_positionX + (xDiff * (float(interDiff) / float(timeDiff))), lastPosition.m_positionY + (yDiff * (float(interDiff) / float(timeDiff))), lastPosition.m_positionZ + (zDiff * (float(interDiff) / float(timeDiff)))); - // Advance (at speed) to this position. The remote sight object is used + // Advance (at speed) to this position. The remote sight object is used // to send update information to player in cinematic if (m_CinematicObject && interPosition.IsPositionValid()) m_CinematicObject->MonsterMoveWithSpeed(interPosition.m_positionX, interPosition.m_positionY, interPosition.m_positionZ, 500.0f, false, true); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 9f19e912c94..9d750f1b6ac 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -14891,7 +14891,7 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, { if (quest->RequiredItemCount[i] > 0 && (itemTemplate->Bonding == BIND_QUEST_ITEM || itemTemplate->Bonding == BIND_QUEST_ITEM1)) DestroyItemCount(quest->RequiredItemId[i], 9999, true, true); - else + else DestroyItemCount(quest->RequiredItemId[i], quest->RequiredItemCount[i], true, true); } } diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 758b8d7c9c2..64029596318 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -426,7 +426,7 @@ void WorldSession::HandleQuestLogRemoveQuest(WorldPacket& recvData) } _player->TakeQuestSourceItem(questId, true); // remove quest src item from player - _player->AbandonQuest(questId); // remove all quest items player received before abandoning quest. Note, this does not remove normal drop items that happen to be quest requirements. + _player->AbandonQuest(questId); // remove all quest items player received before abandoning quest. Note, this does not remove normal drop items that happen to be quest requirements. _player->RemoveActiveQuest(questId); _player->RemoveTimedAchievement(ACHIEVEMENT_TIMED_TYPE_QUEST, questId); diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 449690f96b6..2db689f85ae 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -418,7 +418,7 @@ int32 SpellEffectInfo::CalcValue(Unit const* caster, int32 const* bp, Unit const level = int32(_spellInfo->MaxLevel); else if (level < int32(_spellInfo->BaseLevel)) level = int32(_spellInfo->BaseLevel); - if (!_spellInfo->IsPassive()) + if (!_spellInfo->IsPassive()) level -= int32(_spellInfo->SpellLevel); basePoints += int32(level * basePointsPerLevel); } |
