diff options
| author | Machiavelli <none@none> | 2009-06-16 18:40:57 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-06-16 18:40:57 +0200 |
| commit | bd054b84533305420e368fae85921e43c2382c78 (patch) | |
| tree | 3ad43004b3505717781792afcdb80e7bf389bff2 /src/game/Creature.cpp | |
| parent | e6c3d54e2686b4b7ee9f8ae3bd5815e126b8bfa6 (diff) | |
| parent | 560ca5a2102a082f6712e1a3ec58f9f367532ade (diff) | |
*Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Creature.cpp')
| -rw-r--r-- | src/game/Creature.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 1fbea2da325..eb711a77ab5 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -263,8 +263,8 @@ bool Creature::InitEntry(uint32 Entry, uint32 team, const CreatureData *data ) CreatureInfo const *cinfo = normalInfo; if(normalInfo->HeroicEntry) { - Map *map = MapManager::Instance().FindMap(GetMapId(), GetInstanceId()); - if(map && map->IsHeroic()) + //we already have valid Map pointer for current creature! + if(GetMap()->IsHeroic()) { cinfo = objmgr.GetCreatureTemplate(normalInfo->HeroicEntry); if(!cinfo) |