aboutsummaryrefslogtreecommitdiff
path: root/src/game/Map.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/Map.cpp')
-rw-r--r--src/game/Map.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 7f9a24bc484..ffe5dccfe6b 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -185,9 +185,10 @@ void Map::DeleteStateMachine()
}
Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode)
- : i_mapEntry (sMapStore.LookupEntry(id)), i_spawnMode(SpawnMode),
- i_id(id), i_InstanceId(InstanceId), m_unloadTimer(0), i_gridExpiry(expiry),
- m_activeNonPlayersIter(m_activeNonPlayers.end())
+ : i_mapEntry (sMapStore.LookupEntry(id)), i_spawnMode(SpawnMode),
+ i_id(id), i_InstanceId(InstanceId), m_unloadTimer(0),
+ m_activeNonPlayersIter(m_activeNonPlayers.end()),
+ i_gridExpiry(expiry)
, i_lock(true)
{
for(unsigned int idx=0; idx < MAX_NUMBER_OF_GRIDS; ++idx)
@@ -1340,7 +1341,7 @@ uint16 GridMap::getArea(float x, float y)
return m_area_map[lx*16 + ly];
}
-float GridMap::getHeightFromFlat(float x, float y) const
+float GridMap::getHeightFromFlat(float /*x*/, float /*y*/) const
{
return m_gridHeight;
}