From c3def674ba266c6083d71c2d6eaa9c23b0f6d639 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sat, 10 Jan 2015 18:45:14 +0100
Subject: [PATCH] Changed: Minor changes

---
 code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp       | 2 +-
 .../nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp | 1 -
 code/nel/src/3d/driver/opengl/driver_opengl_window.cpp        | 4 ++--
 code/ryzom/server/src/ai_service/ai_vector_mirror.h           | 2 +-
 code/ryzom/server/src/dynamic_scenario_service/service.cpp    | 2 --
 .../src/entities_game_service/progression/progression_pve.h   | 1 -
 .../server/src/shard_unifier_service/nel_database_mapping.h   | 2 +-
 7 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
index 3aa1f7e25..7b49e20a0 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
@@ -164,7 +164,7 @@ bool CTextureDrvInfosGL::initFrameBufferObject(ITexture * tex)
 
 		// generate IDs
 		nglGenFramebuffersEXT(1, &FBOId);
-		
+
 		//nldebug("3D: using depth %d and stencil %d", DepthFBOId, StencilFBOId);
 
 		// initialize FBO
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
index 5470ec5c5..22bc5ff5a 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
@@ -453,7 +453,6 @@ bool CDriverGL::setupEXTVertexShader(const CVPParser::TProgram &program, GLuint
 	// clear last error
 	GLenum glError = glGetError();
 
-	//variants[EVSSecondaryColorVariant] = nglGenSymbolsEXT(GL_VECTOR_EXT, GL_VARIANT_EXT, GL_NORMALIZED_RANGE_EXT, 1);
 	//variants[EVSSecondaryColorVariant] = nglGenSymbolsEXT(GL_VECTOR_EXT, GL_VARIANT_EXT, GL_NORMALIZED_RANGE_EXT, 1);
 
 	// allocate the symbols
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 172b0e451..4db3f550b 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
@@ -627,8 +627,8 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re
 	// Offscreen mode ?
 	if (_CurrentMode.OffScreen)
 	{
-		if (!createWindow(mode))
-			return false;
+		if (!createWindow(mode)) return false;
+
 		HWND tmpHWND = _win;
 		int width = mode.Width;
 		int height = mode.Height;
diff --git a/code/ryzom/server/src/ai_service/ai_vector_mirror.h b/code/ryzom/server/src/ai_service/ai_vector_mirror.h
index 0464de4fb..da229b4c3 100644
--- a/code/ryzom/server/src/ai_service/ai_vector_mirror.h
+++ b/code/ryzom/server/src/ai_service/ai_vector_mirror.h
@@ -95,7 +95,7 @@ public:		// Methods.
 	inline	double	distTo(const CAIVectorMirror &dest)  const;
 	inline	double	distSqTo(const CAIVectorMirror &dest)  const;
 	inline	double	quickDistTo(const CAIVectorMirror &dest) const;
-	
+
 protected:
 	inline void	setX(const CAICoord &x)	{ _x=x;	}
 	inline void	setY(const CAICoord &y)	{ _y=y;	}
diff --git a/code/ryzom/server/src/dynamic_scenario_service/service.cpp b/code/ryzom/server/src/dynamic_scenario_service/service.cpp
index 342a05c23..07c454566 100644
--- a/code/ryzom/server/src/dynamic_scenario_service/service.cpp
+++ b/code/ryzom/server/src/dynamic_scenario_service/service.cpp
@@ -56,8 +56,6 @@ namespace R2
 // The ligo config
 NLLIGO::CLigoConfig* LigoConfigPtr;
 CR2LigoConfig R2LigoConfig;
-
-
 }
 
 
diff --git a/code/ryzom/server/src/entities_game_service/progression/progression_pve.h b/code/ryzom/server/src/entities_game_service/progression/progression_pve.h
index 11d538ea4..2c9e9aba2 100644
--- a/code/ryzom/server/src/entities_game_service/progression/progression_pve.h
+++ b/code/ryzom/server/src/entities_game_service/progression/progression_pve.h
@@ -279,7 +279,6 @@ struct CCreatureTakenDamage
 		{
 			if ( PlayerInflictedDamage[i].TotalDamage > maxDmg )
 			{
-				nlinfo("set damage by player");
 				maxDmg = PlayerInflictedDamage[i].TotalDamage;
 				index = (sint16)i;
 			}
diff --git a/code/ryzom/server/src/shard_unifier_service/nel_database_mapping.h b/code/ryzom/server/src/shard_unifier_service/nel_database_mapping.h
index 685386bfc..c33e4fe15 100644
--- a/code/ryzom/server/src/shard_unifier_service/nel_database_mapping.h
+++ b/code/ryzom/server/src/shard_unifier_service/nel_database_mapping.h
@@ -625,7 +625,7 @@ namespace RSMGR
 	};
 
 
-		/////////////////////////////////////////////////////////////////
+	/////////////////////////////////////////////////////////////////
 	// WARNING : this is a generated file, don't change it !
 	/////////////////////////////////////////////////////////////////
 	class CNelPermission