Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #825 Remove all warnings when compiling Ryzom

Browse source
This commit is contained in:
kervala 2010-09-16 17:25:48 +02:00
parent 3db8ae1e25
commit 9da8a7db77
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/ryzom/tools/server/ai_build_wmap/build_proximity_maps.cpp
View file

@ -193,7 +193,7 @@ static void processProximityBuffer(const TBuffer& inputBuffer, uint32 lineLength
const uint32 bigValue= 15*5; const uint32 bigValue= 15*5;
// determine numer of lines in the buffer... // 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 // 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(); 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 // 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]); _prepareBufferForZoneProximityMap(zone,zoneBuffer,vects[0]);
entriesToTreat= vects[0].size(); entriesToTreat= (uint32)vects[0].size();
// lookup the buffer dimentions // lookup the buffer dimentions
uint32 zoneWidth= zone.getZoneWidth(); uint32 zoneWidth= zone.getZoneWidth();
@ -631,7 +631,7 @@ void CProximityMapBuffer::generateZoneProximityMap(const CProximityZone& zone,TB
} }
// clear out the vector // clear out the vector
entriesToTreat-= vect.size(); entriesToTreat-= (uint32)vect.size();
vect.clear(); vect.clear();
} }
} }

14
code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp
View file

@ -53,7 +53,7 @@ static void getIslandsInside(sint32 xmin, sint32 xmax, sint32 ymin, sint32 ymax,
{ {
dest.clear(); dest.clear();
R2::CScenarioEntryPoints &sep = R2::CScenarioEntryPoints::getInstance(); R2::CScenarioEntryPoints &sep = R2::CScenarioEntryPoints::getInstance();
uint numIslands = sep.getCompleteIslands().size(); uint numIslands = (uint)sep.getCompleteIslands().size();
for(uint l = 0; l < numIslands; ++l) for(uint l = 0; l < numIslands; ++l)
{ {
const R2::CScenarioEntryPoints::CCompleteIsland &ci = sep.getCompleteIslands()[l]; const R2::CScenarioEntryPoints::CCompleteIsland &ci = sep.getCompleteIslands()[l];
@ -129,7 +129,7 @@ int main(int argc, char* argv[])
CPackedWorldBuilder builder; CPackedWorldBuilder builder;
std::vector<CPackedWorldSmartPtr> islands; std::vector<CPackedWorldSmartPtr> islands;
std::vector<CVector> startPositions; std::vector<CVector> startPositions;
uint numIslands = sep.getCompleteIslands().size(); uint numIslands = (uint)sep.getCompleteIslands().size();
// //
for(uint k = 0; k < numIslands; ++k) 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 // now, see which zones really should be found in that island
std::vector<std::string> presentZoneNames; std::vector<std::string> presentZoneNames;
std::vector<std::string> presentZonePathes; std::vector<std::string> 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()) if (!zonePath.empty())
{ {
presentZonePathes.push_back(zonePath); 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 // the same zones were found -> now check their dates against the island one
uint32 packedIslandDate = CFile::getFileModificationDate(islandPath); uint32 packedIslandDate = CFile::getFileModificationDate(islandPath);
mustRebuild = false; 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; mustRebuild = true;
} }

4
code/ryzom/tools/server/build_world_packed_col/builder_config.cpp
View file

@ -60,7 +60,7 @@ void CBuilderConfig::build(NLMISC::CConfigFile &cf)
if (searchPathsVar) if (searchPathsVar)
{ {
SearchPaths.resize(searchPathsVar->size()); 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); SearchPaths[k] = searchPathsVar->asString(k);
} }
@ -70,7 +70,7 @@ void CBuilderConfig::build(NLMISC::CConfigFile &cf)
if (cwMapListVar) if (cwMapListVar)
{ {
CWMapList.resize(cwMapListVar->size()); 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); CWMapList[k] = cwMapListVar->asString(k);
} }

4
code/ryzom/tools/server/build_world_packed_col/packed_world_builder.cpp
View file

@ -563,14 +563,14 @@ void CPackedWorldBuilder::fly(std::vector<CIslandInfo> &islands, float camSpeed
bool interFound = islands[currWorldIndex].PW->raytrace(camMat.getPos(), lookAtPos, inter, &triList); bool interFound = islands[currWorldIndex].PW->raytrace(camMat.getPos(), lookAtPos, inter, &triList);
if (!triList.empty()) if (!triList.empty())
{ {
vb.setNumVertices(3 * triList.size()); vb.setNumVertices(3 * (uint32)triList.size());
CVertexBufferReadWrite vba; CVertexBufferReadWrite vba;
vb.lock(vba); vb.lock(vba);
CVector *dest = vba.getVertexCoordPointer(0); CVector *dest = vba.getVertexCoordPointer(0);
memcpy(dest, &triList[0], sizeof(CTriangle) * triList.size()); memcpy(dest, &triList[0], sizeof(CTriangle) * triList.size());
vba.unlock(); vba.unlock();
driver->activeVertexBuffer(vb); driver->activeVertexBuffer(vb);
driver->renderRawTriangles(material, 0, triList.size()); driver->renderRawTriangles(material, 0, (uint32)triList.size());
} }
if (interFound) if (interFound)
{ {