aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnubisss <none@none>2009-08-04 01:26:49 +0200
committerAnubisss <none@none>2009-08-04 01:26:49 +0200
commit834c10a0dfb3c2465d65dbdbd5202bd313a159ee (patch)
tree142899c441306d94497a909c64e0d8f4abdf4f23 /src
parentcd1be01444bfda85c33588fe044e81a9077934a5 (diff)
*Use heroic_level_min value (if not 0) from table access_requirement for instances with heroic mode.
*Use level_min value if heroic_level_min == 0 for instances with heroic mode. *Correct heroic_level_min value for all instances. --HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Player.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 1d0c9024412..c6f0b9aafc1 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -15934,8 +15934,7 @@ bool Player::Satisfy(AccessRequirement const *ar, uint32 target_map, bool report
{
if(ar->levelMin && getLevel() < ar->levelMin)
LevelMin = ar->levelMin;
- else if(ar->heroicLevelMin && GetDifficulty() == DIFFICULTY_HEROIC
- && getLevel() < ar->heroicLevelMin)
+ if(ar->heroicLevelMin && GetDifficulty() == DIFFICULTY_HEROIC && getLevel() < ar->heroicLevelMin)
LevelMin = ar->heroicLevelMin;
if(ar->levelMax && getLevel() > ar->levelMax)
LevelMax = ar->levelMax;
@@ -15977,7 +15976,7 @@ bool Player::Satisfy(AccessRequirement const *ar, uint32 target_map, bool report
if(report)
{
if(missingItem)
- GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED_AND_ITEM), ar->levelMin, objmgr.GetItemPrototype(missingItem)->Name1);
+ GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED_AND_ITEM), LevelMin, objmgr.GetItemPrototype(missingItem)->Name1);
else if(missingKey)
SendTransferAborted(target_map, TRANSFER_ABORT_DIFFICULTY);
else if(missingHeroicQuest)