[7745] Fixed gcc warnings. Author: AlexDereka

--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-03 22:21:46 -05:00
parent 5f167c56ef
commit 1cfc04f1f5
18 changed files with 62 additions and 37 deletions

View File

@@ -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;
}