From 40179ff7647e61174e40bd5afe10ce184860fd4e Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 16 Sep 2010 17:25:48 +0200 Subject: [PATCH] Changed: #825 Remove all warnings when compiling Ryzom --- .../server/ai_build_wmap/build_proximity_maps.cpp | 6 +++--- .../build_world_packed_col.cpp | 14 +++++++------- .../build_world_packed_col/builder_config.cpp | 4 ++-- .../packed_world_builder.cpp | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/ryzom/tools/server/ai_build_wmap/build_proximity_maps.cpp b/code/ryzom/tools/server/ai_build_wmap/build_proximity_maps.cpp index 2d5b13716..74a92024f 100644 --- a/code/ryzom/tools/server/ai_build_wmap/build_proximity_maps.cpp +++ b/code/ryzom/tools/server/ai_build_wmap/build_proximity_maps.cpp @@ -193,7 +193,7 @@ static void processProximityBuffer(const TBuffer& inputBuffer, uint32 lineLength const uint32 bigValue= 15*5; // determine numer of lines in the buffer... - uint32 numLines= inputBuffer.size()/ lineLength; + uint32 numLines= (uint32)inputBuffer.size()/ lineLength; // clear out the result buffer and reset all values to 5*255, remembering that this is the correct value for the image edges resultBuffer.clear(); @@ -561,7 +561,7 @@ void CProximityMapBuffer::generateZoneProximityMap(const CProximityZone& zone,TB // setup the buffer's accessible points and prime vects[0] with the set of accessible points in the zone buffer _prepareBufferForZoneProximityMap(zone,zoneBuffer,vects[0]); - entriesToTreat= vects[0].size(); + entriesToTreat= (uint32)vects[0].size(); // lookup the buffer dimentions uint32 zoneWidth= zone.getZoneWidth(); @@ -631,7 +631,7 @@ void CProximityMapBuffer::generateZoneProximityMap(const CProximityZone& zone,TB } // clear out the vector - entriesToTreat-= vect.size(); + entriesToTreat-= (uint32)vect.size(); vect.clear(); } } diff --git a/code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp b/code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp index 7e70fd912..ee08eba42 100644 --- a/code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp +++ b/code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp @@ -53,7 +53,7 @@ static void getIslandsInside(sint32 xmin, sint32 xmax, sint32 ymin, sint32 ymax, { dest.clear(); R2::CScenarioEntryPoints &sep = R2::CScenarioEntryPoints::getInstance(); - uint numIslands = sep.getCompleteIslands().size(); + uint numIslands = (uint)sep.getCompleteIslands().size(); for(uint l = 0; l < numIslands; ++l) { const R2::CScenarioEntryPoints::CCompleteIsland &ci = sep.getCompleteIslands()[l]; @@ -129,7 +129,7 @@ int main(int argc, char* argv[]) CPackedWorldBuilder builder; std::vector islands; std::vector startPositions; - uint numIslands = sep.getCompleteIslands().size(); + uint numIslands = (uint)sep.getCompleteIslands().size(); // for(uint k = 0; k < numIslands; ++k) { @@ -168,13 +168,13 @@ int main(int argc, char* argv[]) // now, see which zones really should be found in that island std::vector presentZoneNames; std::vector presentZonePathes; - for(uint k = 0; k < zoneNames.size(); ++k) + for(uint l = 0; l < zoneNames.size(); ++l) { - std::string zonePath = CPath::lookup(zoneNames[k], false, false); + std::string zonePath = CPath::lookup(zoneNames[l], false, false); if (!zonePath.empty()) { presentZonePathes.push_back(zonePath); - presentZoneNames.push_back(toLower(zoneNames[k])); + presentZoneNames.push_back(toLower(zoneNames[l])); } } // @@ -187,9 +187,9 @@ int main(int argc, char* argv[]) // the same zones were found -> now check their dates against the island one uint32 packedIslandDate = CFile::getFileModificationDate(islandPath); mustRebuild = false; - for(uint k = 0; k < presentZonePathes.size(); ++k) + for(uint l = 0; l < presentZonePathes.size(); ++l) { - if (CFile::getFileModificationDate(presentZonePathes[k]) > packedIslandDate) + if (CFile::getFileModificationDate(presentZonePathes[l]) > packedIslandDate) { mustRebuild = true; } diff --git a/code/ryzom/tools/server/build_world_packed_col/builder_config.cpp b/code/ryzom/tools/server/build_world_packed_col/builder_config.cpp index b80a0341c..cd33b10c5 100644 --- a/code/ryzom/tools/server/build_world_packed_col/builder_config.cpp +++ b/code/ryzom/tools/server/build_world_packed_col/builder_config.cpp @@ -60,7 +60,7 @@ void CBuilderConfig::build(NLMISC::CConfigFile &cf) if (searchPathsVar) { SearchPaths.resize(searchPathsVar->size()); - for(sint k = 0; k < searchPathsVar->size(); ++k) + for(sint k = 0; k < (sint)searchPathsVar->size(); ++k) { SearchPaths[k] = searchPathsVar->asString(k); } @@ -70,7 +70,7 @@ void CBuilderConfig::build(NLMISC::CConfigFile &cf) if (cwMapListVar) { CWMapList.resize(cwMapListVar->size()); - for(sint k = 0; k < cwMapListVar->size(); ++k) + for(sint k = 0; k < (sint)cwMapListVar->size(); ++k) { CWMapList[k] = cwMapListVar->asString(k); } diff --git a/code/ryzom/tools/server/build_world_packed_col/packed_world_builder.cpp b/code/ryzom/tools/server/build_world_packed_col/packed_world_builder.cpp index 812c2459c..c171fe2cf 100644 --- a/code/ryzom/tools/server/build_world_packed_col/packed_world_builder.cpp +++ b/code/ryzom/tools/server/build_world_packed_col/packed_world_builder.cpp @@ -563,14 +563,14 @@ void CPackedWorldBuilder::fly(std::vector &islands, float camSpeed bool interFound = islands[currWorldIndex].PW->raytrace(camMat.getPos(), lookAtPos, inter, &triList); if (!triList.empty()) { - vb.setNumVertices(3 * triList.size()); + vb.setNumVertices(3 * (uint32)triList.size()); CVertexBufferReadWrite vba; vb.lock(vba); CVector *dest = vba.getVertexCoordPointer(0); memcpy(dest, &triList[0], sizeof(CTriangle) * triList.size()); vba.unlock(); driver->activeVertexBuffer(vb); - driver->renderRawTriangles(material, 0, triList.size()); + driver->renderRawTriangles(material, 0, (uint32)triList.size()); } if (interFound) {