diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-20 22:07:56 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-20 22:07:56 +0100 |
| commit | 41822a8ed392357aed43e52135a51456b0a42f96 (patch) | |
| tree | a358f6b3a69d5f928c331e7ccf56849281a956e3 /src/server/game/Events/GameEventMgr.cpp | |
| parent | 455da45d9c476214e1d5567f79c9f029719330be (diff) | |
| parent | 69e81d46b16ab9172c0a0999e387a0fb7f0f939c (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAI.h
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellInfo.h
Diffstat (limited to 'src/server/game/Events/GameEventMgr.cpp')
| -rw-r--r-- | src/server/game/Events/GameEventMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index e2650a91aee..e6d7fb58928 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1362,7 +1362,7 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate) if (data2 && activate) { CreatureTemplate const* cinfo = sObjectMgr->GetCreatureTemplate(data2->id); - uint32 displayID = sObjectMgr->ChooseDisplayId(0, cinfo, data2); + uint32 displayID = ObjectMgr::ChooseDisplayId(cinfo, data2); sObjectMgr->GetCreatureModelRandomGender(&displayID); if (data2->equipmentId == 0) |