From beaeccf2ce9473c610071fd75024bc2779a98239 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Sun, 17 Oct 2010 15:26:57 +0200
Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom

---
 code/nel/src/3d/driver/opengl/driver_opengl.cpp        | 7 +++----
 code/nel/src/3d/driver/opengl/driver_opengl_window.cpp | 2 +-
 code/nel/src/misc/i_xml.cpp                            | 2 +-
 code/nel/src/misc/win_event_emitter.cpp                | 6 +++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.cpp b/code/nel/src/3d/driver/opengl/driver_opengl.cpp
index 5ab7c7475..44eea09bd 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl.cpp
@@ -341,7 +341,7 @@ CDriverGL::~CDriverGL()
 {
 	H_AUTO_OGL(CDriverGL_CDriverGLDtor)
 	release();
-	
+
 #if defined(NL_OS_MAC)
 	[_autoreleasePool release];
 #endif
@@ -362,8 +362,8 @@ bool CDriverGL::setupDisplay()
 		nlinfo("3D: %s", lines[i].c_str());
 
 #ifdef NL_OS_WINDOWS
-	NL3D::registerWGlExtensions (_Extensions, _hDC);
-#endif // ifdef NL_OS_WINDOWS
+	NL3D::registerWGlExtensions(_Extensions, _hDC);
+#endif // NL_OS_WINDOWS
 
 	// Check required extensions!!
 	// ARBMultiTexture is a OpenGL 1.2 required extension.
@@ -851,7 +851,6 @@ bool CDriverGL::swapBuffers()
 		}
 	}
 
-
 #ifdef NL_OS_WINDOWS
 	if (_EventEmitter.getNumEmitters() > 1) // is direct input running ?
 	{
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
index 7656e4242..13b48c662 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
@@ -135,7 +135,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
 			case SC_MONITORPOWER:
 
 			// Prevent From Happening
-			return 0;												
+			return 0;
 
 			default:
 			break;
diff --git a/code/nel/src/misc/i_xml.cpp b/code/nel/src/misc/i_xml.cpp
index 91a32a225..3b198a53c 100644
--- a/code/nel/src/misc/i_xml.cpp
+++ b/code/nel/src/misc/i_xml.cpp
@@ -1083,7 +1083,7 @@ int CIXml::getIntProperty(xmlNodePtr node, const char *property, int defaultValu
 		return defaultValue;
 
 	s=s.strip();
-	int val=s.atoi();
+	sint val=s.atoi();
 	if (val==0 && s!="0")
 	{
 		nlwarning("bad integer value: %s",s.c_str());
diff --git a/code/nel/src/misc/win_event_emitter.cpp b/code/nel/src/misc/win_event_emitter.cpp
index fc01a8b62..2c46a7530 100644
--- a/code/nel/src/misc/win_event_emitter.cpp
+++ b/code/nel/src/misc/win_event_emitter.cpp
@@ -128,11 +128,11 @@ bool CWinEventEmitter::processMessage (HWND hWnd, uint32 msg, WPARAM wParam, LPA
 		if (_KeyboardEventsEnabled)
 		{
 			// Ctrl, shit or alt ?
-			if ((int)wParam==VK_MENU)
+			if ((sint)wParam==VK_MENU)
 				_AltButton=true;
-			if ((int)wParam==VK_CONTROL)
+			if ((sint)wParam==VK_CONTROL)
 				_CtrlButton=true;
-			if ((int)wParam==VK_SHIFT)
+			if ((sint)wParam==VK_SHIFT)
 				_ShiftButton=true;
 
 			// Post the message