From faa583c7843af37d757bd46ca0bd226175dabc38 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 10 Jan 2015 01:35:47 +0100 Subject: Core/Maps: Updated map difficulties --- src/server/game/Maps/Map.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/server/game/Maps/Map.h') diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 7bd21b57072..94b89484e15 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -385,17 +385,16 @@ class Map : public GridRefManager const char* GetMapName() const; // have meaning only for instanced map (that have set real difficulty) - Difficulty GetDifficulty() const { return Difficulty(GetSpawnMode()); } - bool IsRegularDifficulty() const { return GetDifficulty() == DIFFICULTY_NONE; } + Difficulty GetDifficultyID() const { return Difficulty(GetSpawnMode()); } MapDifficulty const* GetMapDifficulty() const; bool Instanceable() const { return i_mapEntry && i_mapEntry->Instanceable(); } bool IsDungeon() const { return i_mapEntry && i_mapEntry->IsDungeon(); } bool IsNonRaidDungeon() const { return i_mapEntry && i_mapEntry->IsNonRaidDungeon(); } bool IsRaid() const { return i_mapEntry && i_mapEntry->IsRaid(); } - bool IsRaidOrHeroicDungeon() const { return IsRaid() || i_spawnMode > DIFFICULTY_NORMAL; } - bool IsHeroic() const { return IsRaid() ? i_spawnMode >= DIFFICULTY_10_HC : i_spawnMode >= DIFFICULTY_HEROIC; } - bool Is25ManRaid() const { return IsRaid() && i_spawnMode & RAID_DIFFICULTY_MASK_25MAN; } // since 25man difficulties are 1 and 3, we can check them like that + bool IsRaidOrHeroicDungeon() const { return IsRaid() || IsHeroic(); } + bool IsHeroic() const; + bool Is25ManRaid() const { return IsRaid() && (i_spawnMode == DIFFICULTY_25_N || i_spawnMode == DIFFICULTY_25_HC); } // since 25man difficulties are 1 and 3, we can check them like that bool IsBattleground() const { return i_mapEntry && i_mapEntry->IsBattleground(); } bool IsBattleArena() const { return i_mapEntry && i_mapEntry->IsBattleArena(); } bool IsBattlegroundOrArena() const { return i_mapEntry && i_mapEntry->IsBattlegroundOrArena(); } -- cgit v1.2.3