Changed: #825 Remove all warning when compiling Ryzom

This commit is contained in:
kervala 2010-10-18 09:05:11 +02:00
parent cfecd4fc6d
commit 1fd95cb093
3 changed files with 5 additions and 5 deletions

View file

@ -1762,7 +1762,7 @@ bool CExport::generateIGFromFlora (const std::string &SrcFile, std::vector<SExpo
if (posf < total) break;
}
if (j == formFlora.PlantInstances.size())
j = formFlora.PlantInstances.size()-1;
j = (uint32)formFlora.PlantInstances.size()-1;
SPlantInstance &rPlant = formFlora.PlantInstances[j];
map<string, SFormPlant>::iterator it = Plants.find (rPlant.Name);
@ -1846,7 +1846,7 @@ bool CExport::generateIGFromFlora (const std::string &SrcFile, std::vector<SExpo
}
if (l == (pPath->VPoints.size()-1))
{
l = pPath->VPoints.size()-2;
l = (uint32)pPath->VPoints.size()-2;
curvAbs = (pPath->VPoints[l]-pPath->VPoints[l+1]).norm();
}
// Calculate the coord

View file

@ -22,7 +22,7 @@
#include "nel/misc/i_xml.h"
#include "../land_export_lib/export.h"
#include "nel/../../src/ligo/zone_region.h"
#include "nel/ligo/zone_region.h"
using namespace std;
using namespace NLMISC;

View file

@ -311,10 +311,10 @@ sint main( sint argc, char ** argv )
}
break;
case 1: // code
skill.Code = strupr(string( ptr ));
skill.Code = toUpper(string( ptr ));
break;
case 2: // parent skill
skill.ParentSkill = strupr(string( ptr ));
skill.ParentSkill = toUpper(string( ptr ));
break;
case 3: // max skill value
skill.MaxValue = (uint16)atoi(ptr);