From a221b39585d15df0d30581ed29a9d300b57dc7b3 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Thu, 10 Mar 2011 23:22:27 +0100
Subject: [PATCH] Changed: #825 Remove all warnings when compiling Ryzom

---
 code/nel/include/nel/misc/bitmap.h                   | 12 +++---------
 .../src/3d/driver/opengl/driver_opengl_window.cpp    |  2 +-
 .../_backup_service_interface_singleton.cpp          |  2 +-
 code/ryzom/common/src/game_share/effect_families.cpp |  8 ++------
 code/ryzom/common/src/game_share/scenario.cpp        | 12 ++++++------
 5 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/code/nel/include/nel/misc/bitmap.h b/code/nel/include/nel/misc/bitmap.h
index 06d8d2670..f689aad86 100644
--- a/code/nel/include/nel/misc/bitmap.h
+++ b/code/nel/include/nel/misc/bitmap.h
@@ -35,15 +35,9 @@ class IStream;
 //------------------ DDS STUFFS --------------------
 
 #ifndef NL_MAKEFOURCC
-	#ifdef NL_LITTLE_ENDIAN
-		#define NL_MAKEFOURCC(ch0, ch1, ch2, ch3) \
-			((uint32)(uint8)(ch0) | ((uint32)(uint8)(ch1) << 8) | \
-			((uint32)(uint8)(ch2) << 16) | ((uint32)(uint8)(ch3) << 24 ))
-	#else
-		#define NL_MAKEFOURCC(ch0, ch1, ch2, ch3) \
-			((uint32)(uint8)(ch3) | ((uint32)(uint8)(ch2) << 8) | \
-			((uint32)(uint8)(ch1) << 16) | ((uint32)(uint8)(ch0) << 24 ))
-	#endif
+    #define NL_MAKEFOURCC(ch0, ch1, ch2, ch3)                              \
+                ((uint32)(uint8)(ch0) | ((uint32)(uint8)(ch1) << 8) |   \
+                ((uint32)(uint8)(ch2) << 16) | ((uint32)(uint8)(ch3) << 24 ))
 #endif
 
 const uint32	DDS_HEADER = NL_MAKEFOURCC('D', 'D', 'S', ' ');
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 a6264f303..48af6cf05 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
@@ -2537,7 +2537,7 @@ bool CDriverGL::isActive()
 	XWindowAttributes attr;
 	Status status = XGetWindowAttributes(_dpy, _win, &attr);
 
-	nlwarning("XGetWindowAttributes returned %d", status);
+	res = (status == 1);
 
 #endif // NL_OS_UNIX
 
diff --git a/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp b/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp
index cb7a58bd1..62b20dd6a 100644
--- a/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp
+++ b/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp
@@ -173,7 +173,7 @@ uint32 CBackupInterfaceSingleton::pushGenericAckCallback(NLMISC::CSmartPtr<IBack
 	++_Counter;
 	if (!_GenericResponses.empty())
 	{
-		nlassert(((sint32)_GenericResponses.front().first-(sint32)requestId)<0);
+		nlassert(_GenericResponses.front().first<requestId);
 	}
 
 	// if we have no callback then just return the generated request Id...
diff --git a/code/ryzom/common/src/game_share/effect_families.cpp b/code/ryzom/common/src/game_share/effect_families.cpp
index bc212aa3c..34c26ae2e 100644
--- a/code/ryzom/common/src/game_share/effect_families.cpp
+++ b/code/ryzom/common/src/game_share/effect_families.cpp
@@ -214,9 +214,7 @@ namespace EFFECT_FAMILIES
 			case DMGTYPE::POISON : return DebuffResistPoison;
 			case DMGTYPE::ELECTRICITY : return DebuffResistElectricity;
 			case DMGTYPE::SHOCK : return DebuffResistSchock;
-			default:
-				return Unknown;
-				break;
+			default: break;
 		}
 		return Unknown;
 	}
@@ -232,9 +230,7 @@ namespace EFFECT_FAMILIES
 		case DMGTYPE::POISON : return CombatDoTPoison;
 		case DMGTYPE::ELECTRICITY : return CombatDoTElectricity;
 		case DMGTYPE::SHOCK : return CombatDoTShock;
-		default:
-			return Unknown;
-			break;
+		default: break;
 		}
 		return Unknown;
 	}
diff --git a/code/ryzom/common/src/game_share/scenario.cpp b/code/ryzom/common/src/game_share/scenario.cpp
index 819e102a3..aef66a1ef 100644
--- a/code/ryzom/common/src/game_share/scenario.cpp
+++ b/code/ryzom/common/src/game_share/scenario.cpp
@@ -836,9 +836,9 @@ bool CScenarioValidator::setScenarioToLoad( const std::string& filename, CScenar
 		static const char * slashheader = "---- /Header\n\n";
 		static const char * comment = "-- ";
 
-		static const unsigned int headerLen = (unsigned int)strlen(header);
-		static const unsigned int slasheaderLen = (unsigned int)strlen(slashheader);
-		static const unsigned int commentLen = (unsigned int)strlen(comment);
+		static const uint headerLen = (uint)strlen(header);
+		static const uint slasheaderLen = (uint)strlen(slashheader);
+		static const uint commentLen = (uint)strlen(comment);
 
 
 		NLMISC::CSString tmp;
@@ -1095,9 +1095,9 @@ bool CUserComponentValidator::setUserComponentToLoad( const std::string& filenam
 		static const char * slashheader = "---- /Header\n\n";
 		static const char * comment = "-- ";
 
-		static const unsigned int headerLen = (unsigned int)strlen(header);
-		static const unsigned int slasheaderLen = (unsigned int)strlen(slashheader);
-		static const unsigned int commentLen = (unsigned int)strlen(comment);
+		static const uint headerLen = (uint)strlen(header);
+		static const uint slasheaderLen = (uint)strlen(slashheader);
+		static const uint commentLen = (uint)strlen(comment);
 
 
 		NLMISC::CSString tmp;