diff options
| author | jackpoz <giacomopoz@gmail.com> | 2017-07-16 18:16:48 +0200 |
|---|---|---|
| committer | vincent-michael <vincent_michael@gmx.de> | 2017-07-16 21:14:22 +0200 |
| commit | fc6b488620282620eada92a6615643cdc9c5411f (patch) | |
| tree | 09148ffe2578ac9d9e15088ca34caaec43a4df6a /src/server/game/Globals/ObjectMgr.cpp | |
| parent | 74e4f73fcb7a2e14e9b2500f1630180defb0cfe9 (diff) | |
Core/Misc: Fix static analysis issues
# Conflicts:
# src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
# src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
# src/server/game/Entities/Unit/Unit.cpp
# src/server/scripts/Commands/cs_ban.cpp
# src/server/scripts/Commands/cs_disable.cpp
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index ccde5347ef8..89fb1ab8a01 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -864,7 +864,7 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo) TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) lists non-existing Modelid1 id (%u), this can crash the client.", cInfo->Entry, cInfo->Modelid1); const_cast<CreatureTemplate*>(cInfo)->Modelid1 = 0; } - else if (!displayScaleEntry) + else displayScaleEntry = displayEntry; CreatureModelInfo const* modelInfo = GetCreatureModelInfo(cInfo->Modelid1); |