diff options
| author | silinoron <none@none> | 2010-09-03 21:55:57 -0700 |
|---|---|---|
| committer | silinoron <none@none> | 2010-09-03 21:55:57 -0700 |
| commit | 5179d3149a247a803da8f2b61c364a538f62fa2d (patch) | |
| tree | 6e0df255bb9669efd9709c7f20aff721c2d06fba /src/server/game/Maps/Map.cpp | |
| parent | 1e1c596dda54d1f13efc7d893c15d2d05b585711 (diff) | |
Core/Game: Fix remaining warnings on windows (and most likely almost all of the ones on *nix)
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 82c6ad143e3..1811868899a 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -216,9 +216,9 @@ Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode, Map* _par i_mapEntry (sMapStore.LookupEntry(id)), i_spawnMode(SpawnMode), i_InstanceId(InstanceId), m_unloadTimer(0), m_VisibleDistance(DEFAULT_VISIBILITY_DISTANCE), m_VisibilityNotifyPeriod(DEFAULT_VISIBILITY_NOTIFY_PERIOD), -m_activeNonPlayersIter(m_activeNonPlayers.end()), i_gridExpiry(expiry), -m_parentMap(_parent ? _parent : this), i_scriptLock(false) +m_activeNonPlayersIter(m_activeNonPlayers.end()), i_gridExpiry(expiry), i_scriptLock(false) { + m_parentMap = (_parent ? _parent : this); for (unsigned int idx=0; idx < MAX_NUMBER_OF_GRIDS; ++idx) { for (unsigned int j=0; j < MAX_NUMBER_OF_GRIDS; ++j) @@ -2966,9 +2966,6 @@ void Map::ScriptsProcess() case HIGHGUID_PET: source = HashMapHolder<Pet>::Find(step.sourceGUID); break; - //case HIGHGUID_VEHICLE: - // source = HashMapHolder<Vehicle>::Find(step.sourceGUID); - // break; case HIGHGUID_PLAYER: source = HashMapHolder<Player>::Find(step.sourceGUID); break; |