diff options
| author | Brian <runningnak3d@gmail.com> | 2010-02-15 07:55:01 -0700 |
|---|---|---|
| committer | Brian <runningnak3d@gmail.com> | 2010-02-15 07:55:01 -0700 |
| commit | 51dae1505d30fa1c2216f76284cc76bf3e3c45d1 (patch) | |
| tree | 40f81c1204bd4f53413af19a6f7b40b4ed5b2169 /src/game/MapInstanced.cpp | |
| parent | b9a4bd8a26ec74a1dede6129764db85a3b6710aa (diff) | |
| parent | 3dd6fdedf739ac87fa9da9a294bdc9ffdca28441 (diff) | |
* Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/MapInstanced.cpp')
| -rw-r--r-- | src/game/MapInstanced.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/MapInstanced.cpp b/src/game/MapInstanced.cpp index f6429d40892..e7d7187d0b5 100644 --- a/src/game/MapInstanced.cpp +++ b/src/game/MapInstanced.cpp @@ -219,10 +219,10 @@ BattleGroundMap* MapInstanced::CreateBattleGround(uint32 InstanceId, BattleGroun sLog.outDebug("MapInstanced::CreateBattleGround: map bg %d for %d created.", InstanceId, GetId()); - // 0-59 normal spawn 60-69 difficulty_1, 70-79 difficulty_2, 80 dufficulty_3 - uint8 spawnMode = (bg->GetQueueId() > QUEUE_ID_MAX_LEVEL_59) ? (bg->GetQueueId() - QUEUE_ID_MAX_LEVEL_59) : 0; - while (!GetMapDifficultyData(GetId(), Difficulty(spawnMode))) - spawnMode--; + PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),bg->GetMinLevel()); + + uint8 spawnMode = bracketEntry ? bracketEntry->difficulty : REGULAR_DIFFICULTY; + BattleGroundMap *map = new BattleGroundMap(GetId(), GetGridExpiry(), InstanceId, this, spawnMode); ASSERT(map->IsBattleGroundOrArena()); map->SetBG(bg); |