diff options
author | Spp <spp@jorge.gr> | 2011-08-04 14:27:10 +0200 |
---|---|---|
committer | Spp <spp@jorge.gr> | 2011-08-04 14:27:10 +0200 |
commit | 473f3410123590bf23d61ab8fbb773654228bb6b (patch) | |
tree | add7aca55ca14b8124af2cdf5477729e5c8eca58 /src/server/game/Conditions/DisableMgr.cpp | |
parent | 1c882084f3b512677c8e90ffdd58d608be051b6a (diff) |
Core/GameEvent: Minor code optimization. (Also cosmetic changes in other unrelated files)
Diffstat (limited to 'src/server/game/Conditions/DisableMgr.cpp')
-rwxr-xr-x | src/server/game/Conditions/DisableMgr.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index 07f97ac67bf..f8c6f6e8c1f 100755 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -16,10 +16,10 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "SpellMgr.h" -#include "ObjectMgr.h" #include "DisableMgr.h" +#include "ObjectMgr.h" #include "OutdoorPvP.h" +#include "SpellMgr.h" #include "VMapManager2.h" DisableMgr::DisableMgr() @@ -77,7 +77,6 @@ void DisableMgr::LoadDisables() switch (type) { case DISABLE_TYPE_SPELL: - { if (!(sSpellMgr->GetSpellInfo(entry) || flags & SPELL_DISABLE_DEPRECATED_SPELL)) { sLog->outErrorDb("Spell entry %u from `disables` doesn't exist in dbc, skipped.", entry); @@ -104,7 +103,7 @@ void DisableMgr::LoadDisables() data.params[1].insert(atoi(tokens[i++])); } - } break; + break; // checked later case DISABLE_TYPE_QUEST: break; @@ -217,7 +216,7 @@ void DisableMgr::LoadDisables() m_DisableMap[type].insert(DisableTypeMap::value_type(entry, data)); ++total_count; - } + } while (result->NextRow()); sLog->outString(">> Loaded %u disables in %u ms", total_count, GetMSTimeDiffToNow(oldMSTime)); @@ -313,7 +312,7 @@ bool DisableMgr::IsDisabledFor(DisableType type, uint32 entry, Unit const* unit, uint8 disabledModes = itr->second.flags; Difficulty targetDifficulty = player->GetDifficulty(mapEntry->IsRaid()); GetDownscaledMapDifficultyData(entry, targetDifficulty); - switch(targetDifficulty) + switch (targetDifficulty) { case DUNGEON_DIFFICULTY_NORMAL: return disabledModes & DUNGEON_STATUSFLAG_NORMAL; |