diff options
| author | Spp <spp@jorge.gr> | 2013-03-20 11:30:23 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-03-20 14:20:17 +0100 |
| commit | b4ee55dd058edcbecf0e4f8e4aece07e8e365270 (patch) | |
| tree | 9ee664023e2da964fbb123f4838036a680d3751b /src/server/game/Globals/ObjectMgr.cpp | |
| parent | a44319a99d24dfce82b8ef7d5a74699f65fc6c46 (diff) | |
Core/Misc: Do not use singleton when calling to static function ChooseDisplayId (and remove unused parameter)
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index effd2057c68..b04d259c5d0 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1083,19 +1083,13 @@ CreatureModelInfo const* ObjectMgr::GetCreatureModelInfo(uint32 modelId) return NULL; } -uint32 ObjectMgr::ChooseDisplayId(uint32 /*team*/, const CreatureTemplate* cinfo, const CreatureData* data /*= NULL*/) +uint32 ObjectMgr::ChooseDisplayId(CreatureTemplate const* cinfo, CreatureData const* data /*= NULL*/) { // Load creature model (display id) - uint32 display_id = 0; - - if (!data || data->displayid == 0) - { - display_id = cinfo->GetRandomValidModelId(); - } - else + if (data && data->displayid) return data->displayid; - return display_id; + return cinfo->GetRandomValidModelId(); } void ObjectMgr::ChooseCreatureFlags(const CreatureTemplate* cinfo, uint32& npcflag, uint32& unit_flags, uint32& dynamicflags, const CreatureData* data /*= NULL*/) |