diff options
| author | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
|---|---|---|
| committer | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
| commit | 42d1562183dd0598de155e30264393edc6925a21 (patch) | |
| tree | 73263639af50fcf177ff9bdf3791d8fc5afce454 /src/server/game/Quests/QuestDef.cpp | |
| parent | 7f4be7e93a03c2f4c964590efb166c7dadcb6837 (diff) | |
| parent | 7f89678bcda1b58ff0701c0915074e81a9caf720 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore.git
Conflicts:
src/server/game/Entities/Player/Player.cpp
Diffstat (limited to 'src/server/game/Quests/QuestDef.cpp')
| -rwxr-xr-x | src/server/game/Quests/QuestDef.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 22251ac0bd8..a1a1f5d5cac 100755 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -166,16 +166,16 @@ Quest::Quest(Field* questRecord) ++m_rewchoiceitemscount; } -uint32 Quest::XPValue(Player* pPlayer) const +uint32 Quest::XPValue(Player* player) const { - if (pPlayer) + if (player) { - int32 quest_level = (QuestLevel == -1 ? pPlayer->getLevel() : QuestLevel); + int32 quest_level = (QuestLevel == -1 ? player->getLevel() : QuestLevel); const QuestXPEntry* xpentry = sQuestXPStore.LookupEntry(quest_level); if (!xpentry) return 0; - int32 diffFactor = 2 * (quest_level - pPlayer->getLevel()) + 20; + int32 diffFactor = 2 * (quest_level - player->getLevel()) + 20; if (diffFactor < 1) diffFactor = 1; else if (diffFactor > 10) |