diff options
| author | Spp <spp@jorge.gr> | 2013-03-25 14:34:22 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-03-25 14:34:22 +0100 |
| commit | c97c381ea0b63963b3756f531b8c64636cb5d66b (patch) | |
| tree | c5a99580d20b16b3eb957faab142b7761fefd507 /src/server/game/Maps/MapInstanced.cpp | |
| parent | 132cc295ca7f1eeb29aaa1ff821faa47ef3478f9 (diff) | |
| parent | 1a6a23ec96c7646d2753198f93eaba62d2732a83 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Events/GameEventMgr.cpp
src/server/game/Loot/LootMgr.cpp
src/server/shared/Packets/ByteBuffer.h
Diffstat (limited to 'src/server/game/Maps/MapInstanced.cpp')
| -rw-r--r-- | src/server/game/Maps/MapInstanced.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp index c2079c22e76..62fec9e4b20 100644 --- a/src/server/game/Maps/MapInstanced.cpp +++ b/src/server/game/Maps/MapInstanced.cpp @@ -29,8 +29,6 @@ MapInstanced::MapInstanced(uint32 id, time_t expiry) : Map(id, expiry, 0, DUNGEON_DIFFICULTY_NORMAL) { - // initialize instanced maps list - m_InstancedMaps.clear(); // fill with zero memset(&GridMapReference, 0, MAX_NUMBER_OF_GRIDS*MAX_NUMBER_OF_GRIDS*sizeof(uint16)); } |