Changed: Minor changes

--HG--
branch : develop

code/nel/include/nel/3d/driver.h

@@ -493,7 +493,7 @@ public:
 	 *
 	 * NB: you must setupViewMatrix() BEFORE setupModelMatrix(), or else undefined results.
 	 */
-	virtual void			setupViewMatrix(const CMatrix &mtx)=0;
+	virtual void			setupViewMatrix(const CMatrix &mtx) = 0;
 
 	/** setup the view matrix (inverse of camera matrix).
 	 *	Extended: give a cameraPos (mtx.Pos() is not taken into account but for getViewMatrix()),
@@ -1422,7 +1422,6 @@ protected:
 
 private:
 	bool					_StaticMemoryToVRAM;
-
 };
 
 // --------------------------------------------------

code/nel/src/3d/driver/direct3d/driver_direct3d.cpp

@@ -1509,9 +1509,6 @@ bool CDriverD3D::setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool r
 		}
 	}
 
-	
-//	_D3D->CreateDevice (adapter, _Rasterizer, _HWnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &parameters, &_DeviceInterface);
-
 	// Check some caps
 	D3DCAPS9 caps;
 	if (_DeviceInterface->GetDeviceCaps(&caps) == D3D_OK)

code/nel/src/3d/driver/opengl/driver_opengl.cpp

@@ -2178,7 +2178,7 @@ void CDriverGL::flush()
 // ***************************************************************************
 void	CDriverGL::setSwapVBLInterval(uint interval)
 {
-	H_AUTO_OGL(CDriverGL_setSwapVBLInterval)
+	H_AUTO_OGL(CDriverGL_setSwapVBLInterval);
 
 	if (!_Initialized)
 		return;

code/nel/src/3d/driver/opengl/driver_opengl_states.cpp

@@ -767,7 +767,7 @@ void			CDriverGLStates::setTextureMode(TTextureMode texMode)
 		{
 			glDisable(GL_TEXTURE_2D);
 		}
-		else if(oldTexMode == TextureRect)
+		else if (oldTexMode == TextureRect)
 		{
 #ifndef USE_OPENGLES
 			if(_TextureRectangleSupported)
@@ -780,7 +780,7 @@ void			CDriverGLStates::setTextureMode(TTextureMode texMode)
 				glDisable(GL_TEXTURE_2D);
 			}
 		}
-		else if(oldTexMode == TextureCubeMap)
+		else if (oldTexMode == TextureCubeMap)
 		{
 			if(_TextureCubeMapSupported)
 			{

code/nel/src/3d/meshvp_wind_tree.cpp

@@ -392,7 +392,6 @@ bool	CMeshVPWindTree::begin(IDriver *driver, CScene *scene, CMeshBaseInstance *m
 	sint	numPls= renderTrav->getNumVPLights()-1;
 	clamp(numPls, 0, CRenderTrav::MaxVPLight-1);
 
-
 	// Enable normalize only if requested by user. Because lighting don't manage correct "scale lighting"
 	uint	idVP= (SpecularLighting?2:0) + (driver->isForceNormalize()?1:0) ;
 	// correct VP id for correct unmber of pls.
@@ -523,7 +522,7 @@ void	CMeshVPWindTree::beginMBRInstance(IDriver *driver, CScene *scene, CMeshBase
 	idVP = numPls*4 + idVP;
 
 	// re-activate VP if idVP different from last setup
-	if(idVP != _LastMBRIdVP)
+	if (idVP != _LastMBRIdVP)
 	{
 		_LastMBRIdVP= idVP;
 		driver->activeVertexProgram(_VertexProgram[_LastMBRIdVP]);

code/nel/src/3d/scene.cpp

@@ -158,7 +158,7 @@ CScene::CScene(bool bSmallScene) : LightTrav(bSmallScene)
 
 	_MaxSkeletonsInNotCLodForm= 20;
 
-	_FilterRenderFlags= std::numeric_limits<uint32>::max();
+	_FilterRenderFlags = std::numeric_limits<uint32>::max();
 
 	_NextRenderProfile= false;
 
@@ -592,11 +592,9 @@ void	CScene::renderPart(UScene::TRenderPart rp, bool	doHrcPass, bool doTrav, boo
 		//
 		nlassert(CurrentCamera);
 
-
 		// update models.
 		updateModels();
 
-
 		// Use the camera to setup Clip / Render pass.
 		float left, right, bottom, top, znear, zfar;
 		CurrentCamera->getFrustum(left, right, bottom, top, znear, zfar);

code/nel/src/3d/transform.cpp

@@ -113,7 +113,7 @@ CTransform::CTransform()
 	_StateFlags= IsOpaque | IsUserLightable;
 
 	// By default, always allow rendering of Transform Models.
-	_RenderFilterType= std::numeric_limits<uint32>::max();
+	_RenderFilterType = std::numeric_limits<uint32>::max();
 
 	// By default, don't suport fast intersection detection
 	_SupportFastIntersect= false;

code/nel/src/georges/form_dfn.cpp

@@ -707,7 +707,7 @@ bool CFormDfn::getEntryIndexByName (uint &entry, const	std::string &name) const
 		}
 		entryIndex++;
 	}
-	entry=std::numeric_limits<uint>::max();
+	entry = std::numeric_limits<uint>::max();
 	return	false;
 }
 

code/nel/src/misc/p_thread.cpp

@@ -17,8 +17,8 @@
 
 #include "stdmisc.h"
 
-#include <nel/misc/types_nl.h>
+#include "nel/misc/types_nl.h"
-#include <nel/misc/debug.h>
+#include "nel/misc/debug.h"
 
 #ifdef NL_OS_UNIX
 

code/nel/tools/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 # Don't add other subdirectories if only max plugins are selected.
 IF(WITH_NEL_TOOLS)
   ADD_SUBDIRECTORY(misc)

code/ryzom/client/src/actions.h

@@ -30,8 +30,8 @@
 ///////////
 // CLASS //
 class CCombo;
-class CActionsManager;
 class CAction;
+class CActionsManager;
 
 /**
  * The goal of CCombo is to gather together Inputs that will validate an Action.

code/ryzom/client/src/cdb_synchronised.cpp

@@ -41,7 +41,7 @@
 
 #include <string>
 
-#include "../../common/src/game_share/ryzom_database_banks.h"
+#include "game_share/ryzom_database_banks.h"
 
 
 ////////////////

code/ryzom/client/src/character_cl.cpp

@@ -4537,7 +4537,7 @@ void CCharacterCL::applyBehaviourFlyingHPs(const CBehaviourContext &bc, const MB
 	{
 		if(behaviour.DeltaHP != 0)
 		{
-			CRGBA deltaHPColor( 0, 0, 0 );
+			CRGBA deltaHPColor(0, 0, 0);
 			// if it's a hit
 			if( behaviour.DeltaHP < 0 )
 			{

code/ryzom/client/src/client.cpp

@@ -26,7 +26,6 @@
 #include "nel/misc/types_nl.h"
 
 #ifdef NL_OS_WINDOWS
-#include <windows.h>
 #include <shellapi.h>
 #else
 #include <csignal>

code/ryzom/client/src/client_chat_manager.cpp

@@ -969,8 +969,6 @@ void CClientChatManager::buildTellSentence(const ucstring &sender, const ucstrin
 					name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(name), bWoman);
 				}
 			}
-
-
 		}
 		else
 		{
@@ -1052,8 +1050,6 @@ void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderInde
 					senderName = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(senderName), bWoman);
 				}
 			}
-
-
 		}
 
 		switch(type)

code/ryzom/client/src/entity_cl.cpp

@@ -2296,6 +2296,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const ucstring &value)
 			}
 			
 			ucstring replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, womanTitle));
+
 			// Sometimes translation contains another title
 			{
 				ucstring::size_type pos = replacement.find('$');

code/ryzom/client/src/far_tp.cpp

@@ -189,7 +189,6 @@ const std::string& CLoginStateMachine::toString(CLoginStateMachine::TEvent event
 			break;						\
 		}								\
 
-
 extern std::string LoginLogin, LoginPassword;
 extern bool noUserChar;
 extern bool userChar;

code/ryzom/client/src/init.cpp

@@ -1077,7 +1077,7 @@ void prelogInit()
 
 		// Set the monitor color properties
 		CMonitorColorProperties monitorColor;
-		for ( uint i=0; i<3; i++)
+		for (uint i=0; i<3; i++)
 		{
 			monitorColor.Contrast[i] = ClientCfg.Contrast;
 			monitorColor.Luminosity[i] = ClientCfg.Luminosity;

code/ryzom/client/src/interface_v3/action_handler_game.cpp

@@ -1957,6 +1957,7 @@ public:
 					{
 						copyInout = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout), womanTitle);
 					}
+
 					CStringPostProcessRemoveTitle::cbIDStringReceived(copyInout);
 					inout = copyInout;
 				}

code/ryzom/client/src/interface_v3/action_handler_help.cpp

@@ -3613,7 +3613,7 @@ public:
 		uint8 index;
 		fromString(Params, index);
 		--index; // Param is 1-based so subtract 1
-		if ( index >= MAX_INVENTORY_ANIMAL)
+		if (index >= MAX_INVENTORY_ANIMAL)
 		{
 			return;
 		}

code/ryzom/client/src/interface_v3/action_handler_misc.cpp

@@ -520,7 +520,7 @@ CCameraBackup setupCameraForScreenshot(UScene &scene, uint left, uint right, uin
 	// Build a viewport
 	CViewport viewport;
 	NL3D::UDriver *Driver = CViewRenderer::getInstance()->getDriver();
-	viewport.init (0, 0, (float)(right-left)/Driver->getWindowWidth(),(float)(bottom-top)/Driver->getWindowHeight());
+	viewport.init (0, 0, (float)(right-left)/Driver->getWindowWidth(), (float)(bottom-top)/Driver->getWindowHeight());
 
 	// Activate all this
 	scene.getCam().setFrustum (frustumPart);

code/ryzom/client/src/interface_v3/action_handler_phrase.cpp

@@ -777,7 +777,7 @@ void CHandlerMemorizePhraseOrMacro::execute (CCtrlBase *pCaller, const string &P
 	sint32 dstPhraseId= pCSDst->getSPhraseId();
 	sint32 dstMacroId= pCSDst->getMacroId();
 
-	if ((src.empty()) && (CHandlerPhraseMemoryCopy::haveLastPhraseElement))
+	if (src.empty() && (CHandlerPhraseMemoryCopy::haveLastPhraseElement))
 	{		
 		// get the slot ids from save
 		srcIsMacro= CHandlerPhraseMemoryCopy::isMacro;
@@ -1600,7 +1600,6 @@ public:
 		}
 	}
 };
-
 REGISTER_ACTION_HANDLER(CHandlerPhraseSelectMemory2, "phrase_select_memory_2");
 
 // ***************************************************************************

code/ryzom/client/src/interface_v3/chat_displayer.h

@@ -30,7 +30,6 @@
 #undef LOG_WARNING
 #endif
 
-
 /**
  * class used to display console text commands in the chat window
  * \author Nicolas Brigand

code/ryzom/client/src/interface_v3/chat_text_manager.cpp

@@ -47,7 +47,6 @@ CChatTextManager::~CChatTextManager()
 	_TextShadowed = NULL;
 	delete _ShowTimestamps;
 	_ShowTimestamps = NULL;
-
 }
 //=================================================================================
 uint CChatTextManager::getTextFontSize() const
@@ -96,6 +95,7 @@ bool CChatTextManager::showTimestamps() const
 	}
 	return _ShowTimestamps->getValueBool();
 }
+
 //=================================================================================
 static CInterfaceGroup *parseCommandTag(ucstring &line)
 {
@@ -186,7 +186,6 @@ CViewBase *CChatTextManager::createMsgText(const ucstring &cstMsg, NLMISC::CRGBA
 			msg = cur_time + msg;
 		}
 		
-
 		vt->setTextFormatTaged(msg);
 		vt->setColor(NLMISC::CRGBA::White);
 	}

code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp

@@ -652,7 +652,6 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 				if (pPlayer == NULL)
 					needPvPLogo = false;
 
-
 				if (pPlayer != NULL && needPvPLogo)
 				{
 					if (pvpFactionLogo) 
@@ -756,7 +755,6 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 				view = leftGroup->getView ("win_jauge_bot");
 				if (view)
 					leftGroup->delView (view);
-
 			}
 
 			// Delete remaining strings
@@ -771,8 +769,7 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 			CViewBase *win_mid = leftGroup->getView ("win_mid");
 			if (win_mid)
 			{
-				win_mid->setH (win_mid->getH() - spaceBar/2 );
+				win_mid->setH (win_mid->getH() - spaceBar/2);
-
 			}
 
 			// Set player name

code/ryzom/client/src/interface_v3/guild_manager.cpp

@@ -398,7 +398,6 @@ void CGuildManager::update()
 						bool dummy;
 						PeopleInterraction.ChatInput.Guild.displayMessage(msg, col, 2, &dummy);
 						break;
-
 					}
 				}
 

code/ryzom/client/src/interface_v3/interface_manager.cpp

@@ -3982,5 +3982,3 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 	ucstr = str;
 	return true;;
 }
-
-

code/ryzom/client/src/interface_v3/people_interraction.cpp

@@ -2193,7 +2193,6 @@ class CHandlerTellContact : public IActionHandler
 		CInterfaceGroup *ig = pCaller->getParent();
 		if (!ig) return;
 		CGroupContainer *gc = static_cast< CGroupContainer* >( ig->getEnclosingContainer() );
-
 		if (!gc) return;
 		CPeopleList *list;
 		uint peopleIndex;

code/ryzom/client/src/interface_v3/sphrase_manager.cpp

@@ -474,16 +474,16 @@ void				CSPhraseManager::memorizePhrase(uint32 memoryLine, uint32 memorySlot, ui
 	}
 }
 
-void CSPhraseManager::selectMemoryLineDBalt(sint32 memoryLine)
+// ***************************************************************************
+void CSPhraseManager::selectMemoryLineDB(sint32 memoryLine)
 {
 	if(memoryLine<0)
 		memoryLine= -1;
 
-	if(_SelectedMemoryDBalt!=memoryLine)
+	if(_SelectedMemoryDB!=memoryLine)
 	{
-		_SelectedMemoryDBalt= memoryLine;
+		_SelectedMemoryDB= memoryLine;
 		// since memory selection changes then must update all the DB and the Ctrl states
-		
 		updateMemoryDBAll();
 		updateAllMemoryCtrlState();
 		updateAllMemoryCtrlRegenTickRange();
@@ -492,14 +492,14 @@ void CSPhraseManager::selectMemoryLineDBalt(sint32 memoryLine)
 	}
 }
 
-// ***************************************************************************
+void CSPhraseManager::selectMemoryLineDBalt(sint32 memoryLine)
-void				CSPhraseManager::selectMemoryLineDB(sint32 memoryLine)
 {
 	if(memoryLine<0)
 		memoryLine= -1;
-	if(_SelectedMemoryDB!=memoryLine)
+
+	if(_SelectedMemoryDBalt!=memoryLine)
 	{
-		_SelectedMemoryDB= memoryLine;
+		_SelectedMemoryDBalt= memoryLine;
 		// since memory selection changes then must update all the DB and the Ctrl states
 		updateMemoryDBAll();
 		updateAllMemoryCtrlState();