From 015b3a5d19b650c297f9caac2b3c5d4a4882728c Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 28 Jul 2012 12:20:36 +0000 Subject: [PATCH] Caves and Ravines: fixed compilation and linking issues on gcc git-svn-id: http://mc-server.googlecode.com/svn/trunk@699 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Caves.cpp | 6 +++--- source/Ravines.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/Caves.cpp b/source/Caves.cpp index 4cc8506ed..e06539f0f 100644 --- a/source/Caves.cpp +++ b/source/Caves.cpp @@ -481,7 +481,7 @@ void cCaveTunnel::ProcessChunk( int DifY = itr->m_BlockY; int DifZ = itr->m_BlockZ - BlockStartZ; // substitution for faster calc int Bottom = std::max(itr->m_BlockY - itr->m_Radius, 1); - int Top = std::min(itr->m_BlockY + itr->m_Radius, cChunkDef::Height); + int Top = std::min(itr->m_BlockY + itr->m_Radius, (int)(cChunkDef::Height)); // Stupid gcc needs int cast int SqRad = itr->m_Radius * itr->m_Radius; for (int z = 0; z < cChunkDef::Width; z++) for (int x = 0; x < cChunkDef::Width; x++) { @@ -748,7 +748,7 @@ void cStructGenWormNestCaves::GetCavesForChunk(int a_ChunkX, int a_ChunkZ, cStru int EndX = (BaseX + NEIGHBORHOOD_SIZE + 1) * m_Grid; int StartZ = BaseZ * m_Grid; int EndZ = (BaseZ + NEIGHBORHOOD_SIZE + 1) * m_Grid; - for (cCaveSystems::const_iterator itr = m_Cache.begin(), end = m_Cache.end(); itr != end;) + for (cCaveSystems::iterator itr = m_Cache.begin(), end = m_Cache.end(); itr != end;) { if ( ((*itr)->m_BlockX >= StartX) && ((*itr)->m_BlockX < EndX) && @@ -795,7 +795,7 @@ void cStructGenWormNestCaves::GetCavesForChunk(int a_ChunkX, int a_ChunkZ, cStru // Trim the cache if it's too long: if (m_Cache.size() > 100) { - cCaveSystems::const_iterator itr = m_Cache.begin(); + cCaveSystems::iterator itr = m_Cache.begin(); std::advance(itr, 100); for (cCaveSystems::const_iterator end = m_Cache.end(); itr != end; ++itr) { diff --git a/source/Ravines.cpp b/source/Ravines.cpp index cee1192d6..1474c5e8d 100644 --- a/source/Ravines.cpp +++ b/source/Ravines.cpp @@ -450,7 +450,7 @@ void cStructGenRavines::cRavine::ProcessChunk( int DistSq = (DifX + x) * (DifX + x) + (DifZ + z) * (DifZ + z); if (DistSq <= RadiusSq) { - int Top = std::min(itr->m_Top, cChunkDef::Height); + int Top = std::min(itr->m_Top, (int)(cChunkDef::Height)); // Stupid gcc needs int cast for (int y = std::max(itr->m_Bottom, 1); y <= Top; y++) { cChunkDef::SetBlock(a_BlockTypes, x, y, z, E_BLOCK_AIR);