From 1fd95cb093f1b1611b7288d7cda06352778dc8fe Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Mon, 18 Oct 2010 09:05:11 +0200
Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom

---
 code/ryzom/tools/leveldesign/export/export.cpp                | 4 ++--
 .../ryzom/tools/leveldesign/world_editor/land_export/main.cpp | 2 +-
 code/ryzom/tools/skill_extractor/skill_extractor.cpp          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/ryzom/tools/leveldesign/export/export.cpp b/code/ryzom/tools/leveldesign/export/export.cpp
index 2b763efee..49b79193e 100644
--- a/code/ryzom/tools/leveldesign/export/export.cpp
+++ b/code/ryzom/tools/leveldesign/export/export.cpp
@@ -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
diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export/main.cpp b/code/ryzom/tools/leveldesign/world_editor/land_export/main.cpp
index 362a67f24..d3e107d17 100644
--- a/code/ryzom/tools/leveldesign/world_editor/land_export/main.cpp
+++ b/code/ryzom/tools/leveldesign/world_editor/land_export/main.cpp
@@ -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;
diff --git a/code/ryzom/tools/skill_extractor/skill_extractor.cpp b/code/ryzom/tools/skill_extractor/skill_extractor.cpp
index fa03d37c7..37b3f1020 100644
--- a/code/ryzom/tools/skill_extractor/skill_extractor.cpp
+++ b/code/ryzom/tools/skill_extractor/skill_extractor.cpp
@@ -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);