diff options
| author | jackpoz <giacomopoz@gmail.com> | 2017-07-15 16:31:07 +0200 |
|---|---|---|
| committer | vincent-michael <vincent_michael@gmx.de> | 2017-07-16 20:50:43 +0200 |
| commit | 74e4f73fcb7a2e14e9b2500f1630180defb0cfe9 (patch) | |
| tree | d4b79ced584eaa8e0bc9c86d26f744ea02d5960d /src | |
| parent | b81c2e7971627983c595a9ea915594933104b8b9 (diff) | |
Core/Misc: Fix static analysis issues
(cherry picked from commit 7d3291e8044841b085ca5b0987bdf25269881863)
# Conflicts:
# src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Battlegrounds/BattlegroundMgr.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/Battlegrounds/BattlegroundMgr.h | 2 | ||||
| -rw-r--r-- | src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp | 3 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index c779adce640..a2d5c06402a 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -875,7 +875,6 @@ BattlegroundTypeId BattlegroundMgr::GetRandomBG(BattlegroundTypeId bgTypeId) { if (BattlegroundTemplate const* bgTemplate = GetBattlegroundTemplateByTypeId(bgTypeId)) { - BattlegroundSelectionWeightMap selectionWeights; std::vector<BattlegroundTypeId> ids; ids.reserve(16); std::vector<double> weights; diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h index e69c934ea91..c69d0b654da 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.h +++ b/src/server/game/Battlegrounds/BattlegroundMgr.h @@ -178,8 +178,6 @@ class TC_GAME_API BattlegroundMgr return nullptr; } - typedef std::map<BattlegroundTypeId, uint8 /*weight*/> BattlegroundSelectionWeightMap; - typedef std::map<BattlegroundTypeId, BattlegroundTemplate> BattlegroundTemplateMap; typedef std::map<uint32 /*mapId*/, BattlegroundTemplate*> BattlegroundMapTemplateContainer; BattlegroundTemplateMap _battlegroundTemplates; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index b4390690c59..ce22b7c69df 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -1122,8 +1122,7 @@ class boss_grand_astromancer_capernian : public CreatureScript //Conflagration_Timer if (Conflagration_Timer <= diff) { - Unit* target = NULL; - target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); if (target && me->IsWithinDistInMap(target, 30)) DoCast(target, SPELL_CONFLAGRATION); |