diff options
| author | Spp <spp@jorge.gr> | 2013-11-08 10:29:51 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-11-08 10:29:51 +0100 |
| commit | 990e4c78514e3a3f8e8905cf22dfacbb0c4fba67 (patch) | |
| tree | aa9140f37cedf8a445608f3849bcc566c2cf0a51 /src/server/game/Grids/ObjectGridLoader.h | |
| parent | 184fe092c3a7d37eb3983ec11e3f5d3a9f6640fa (diff) | |
| parent | 16a51e328a12b8eafb7ff2c18806ca9aef6b23a2 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.h
src/server/game/AI/EventAI/CreatureEventAIMgr.h
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/DungeonFinding/LFGMgr.h
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Object/Updates/UpdateData.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Grids/Notifiers/GridNotifiers.h
src/server/game/Grids/ObjectGridLoader.h
src/server/game/Spells/SpellInfo.h
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_desolace.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Kalimdor/zone_thousand_needles.cpp
src/tools/map_extractor/System.cpp
src/tools/map_extractor/mpq_libmpq.cpp
src/tools/map_extractor/mpq_libmpq04.h
src/tools/vmap4_extractor/loadlib/loadlib.h
src/tools/vmap4_extractor/mpq_libmpq.cpp
src/tools/vmap4_extractor/mpq_libmpq04.h
Diffstat (limited to 'src/server/game/Grids/ObjectGridLoader.h')
| -rw-r--r-- | src/server/game/Grids/ObjectGridLoader.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h index dafc3954939..8369600c6e1 100644 --- a/src/server/game/Grids/ObjectGridLoader.h +++ b/src/server/game/Grids/ObjectGridLoader.h @@ -34,13 +34,13 @@ class ObjectGridLoader public: ObjectGridLoader(NGridType &grid, Map* map, const Cell &cell) : i_cell(cell), i_grid(grid), i_map(map), i_gameObjects(0), i_creatures(0), i_corpses (0) - {} + { } void Visit(GameObjectMapType &m); void Visit(CreatureMapType &m); - void Visit(CorpseMapType &) const {} - void Visit(DynamicObjectMapType&) const {} - void Visit(AreaTriggerMapType &) const {} + void Visit(CorpseMapType &) const { } + void Visit(DynamicObjectMapType&) const { } + void Visit(AreaTriggerMapType &) const { } void LoadN(void); @@ -60,7 +60,7 @@ class ObjectGridStoper { public: void Visit(CreatureMapType &m); - template<class T> void Visit(GridRefManager<T> &) {} + template<class T> void Visit(GridRefManager<T> &) { } }; //Move the foreign creatures back to respawn positions before unloading the NGrid @@ -69,7 +69,7 @@ class ObjectGridEvacuator public: void Visit(CreatureMapType &m); void Visit(GameObjectMapType &m); - template<class T> void Visit(GridRefManager<T> &) {} + template<class T> void Visit(GridRefManager<T> &) { } }; //Clean up and remove from world |