aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Conditions/DisableMgr.cpp
diff options
context:
space:
mode:
authorRat <gmstreetrat@gmail.com>2014-11-16 14:20:01 +0100
committerRat <gmstreetrat@gmail.com>2014-11-16 14:20:01 +0100
commit588143b9b69a81eee69d5fb3b9690c8aafc1a38f (patch)
treea5ff6545b7360592475e4272147216a43218e91c /src/server/game/Conditions/DisableMgr.cpp
parentc375748b7636fe88f1daf37197dc9da3d4a674a1 (diff)
Core/Spells: Spell system updates (don't even try to compile this)
Diffstat (limited to 'src/server/game/Conditions/DisableMgr.cpp')
-rw-r--r--src/server/game/Conditions/DisableMgr.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp
index a7cf8478704..65c5ec6873a 100644
--- a/src/server/game/Conditions/DisableMgr.cpp
+++ b/src/server/game/Conditions/DisableMgr.cpp
@@ -134,11 +134,11 @@ void LoadDisables()
break;
case MAP_INSTANCE:
case MAP_RAID:
- if (flags & DUNGEON_STATUSFLAG_HEROIC && !GetMapDifficultyData(entry, DUNGEON_DIFFICULTY_HEROIC))
+ if (flags & DUNGEON_STATUSFLAG_HEROIC && !GetMapDifficultyData(entry, DIFFICULTY_HEROIC))
flags -= DUNGEON_STATUSFLAG_HEROIC;
- if (flags & RAID_STATUSFLAG_10MAN_HEROIC && !GetMapDifficultyData(entry, RAID_DIFFICULTY_10MAN_HEROIC))
+ if (flags & RAID_STATUSFLAG_10MAN_HEROIC && !GetMapDifficultyData(entry, DIFFICULTY_10_HC))
flags -= RAID_STATUSFLAG_10MAN_HEROIC;
- if (flags & RAID_STATUSFLAG_25MAN_HEROIC && !GetMapDifficultyData(entry, RAID_DIFFICULTY_25MAN_HEROIC))
+ if (flags & RAID_STATUSFLAG_25MAN_HEROIC && !GetMapDifficultyData(entry, DIFFICULTY_25_HC))
flags -= RAID_STATUSFLAG_25MAN_HEROIC;
if (!flags)
isFlagInvalid = true;
@@ -354,13 +354,13 @@ bool IsDisabledFor(DisableType type, uint32 entry, Unit const* unit, uint8 flags
GetDownscaledMapDifficultyData(entry, targetDifficulty);
switch (targetDifficulty)
{
- case DUNGEON_DIFFICULTY_NORMAL:
+ case DIFFICULTY_NORMAL:
return (disabledModes & DUNGEON_STATUSFLAG_NORMAL) != 0;
- case DUNGEON_DIFFICULTY_HEROIC:
+ case DIFFICULTY_HEROIC:
return (disabledModes & DUNGEON_STATUSFLAG_HEROIC) != 0;
- case RAID_DIFFICULTY_10MAN_HEROIC:
+ case DIFFICULTY_10_HC:
return (disabledModes & RAID_STATUSFLAG_10MAN_HEROIC) != 0;
- case RAID_DIFFICULTY_25MAN_HEROIC:
+ case DIFFICULTY_25_HC:
return (disabledModes & RAID_STATUSFLAG_25MAN_HEROIC) != 0;
}
}