From f232afbd4de27d8619f5a629403ffab2bf7f2367 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Wed, 2 Dec 2015 18:55:31 +0100
Subject: [PATCH] Changed: Minor changes

---
 code/ryzom/client/src/init_main_loop.cpp      |  6 ++---
 .../src/interface_v3/action_handler_game.cpp  |  6 +++--
 code/ryzom/client/src/main_loop.h             | 23 +------------------
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/code/ryzom/client/src/init_main_loop.cpp b/code/ryzom/client/src/init_main_loop.cpp
index 48b970d11..ccab8b337 100644
--- a/code/ryzom/client/src/init_main_loop.cpp
+++ b/code/ryzom/client/src/init_main_loop.cpp
@@ -1340,10 +1340,10 @@ void initMainLoop()
 	// init CSessionBrowserImpl
 	CSessionBrowserImpl::getInstance().init(CLuaManager::getInstance().getLuaState());
 
-	// active/desactive welcome window
+	// enable/disable welcome window
 	initWelcomeWindow();
 
-	// active/desactive bloom config interface
+	// enable/disable bloom config interface
 	initBloomConfigUI();
 
 	// popup to offer hardware cursor activation
@@ -1364,7 +1364,7 @@ void destroyLoadingBitmap ()
 		// Destroy the Loading Background.
 		Driver->deleteTextureFile(LoadingBitmap);
 		LoadingBitmap = NULL;
-		LoadingBitmapFilename = "";
+		LoadingBitmapFilename.clear();
 		LoadingMaterial.setTexture (0, NULL);
 	}
 	if (LoadingBitmapFull && Driver)
diff --git a/code/ryzom/client/src/interface_v3/action_handler_game.cpp b/code/ryzom/client/src/interface_v3/action_handler_game.cpp
index 8457185e7..da005e56c 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -3034,7 +3034,7 @@ public:
 
 		// **** Init Texture Size Modes
 		// init the combo box, according to Texture Installed or not
-		pCB= dynamic_cast<CDBGroupComboBox*>(CWidgetManager::getInstance()->getElementFromId( GAME_CONFIG_TEXTURE_MODE_COMBO ));
+		pCB = dynamic_cast<CDBGroupComboBox*>(CWidgetManager::getInstance()->getElementFromId( GAME_CONFIG_TEXTURE_MODE_COMBO ));
 		if( pCB )
 		{
 			pCB->resetTexts();
@@ -3050,6 +3050,7 @@ public:
 		{
 			pBut->setPushed(ClientCfg.VREnable);
 		}
+
 		updateVRDevicesComboUI(ClientCfg.VREnable);
 
 		// init the mode in DB
@@ -3060,6 +3061,7 @@ public:
 			texMode= HighTextureMode;
 		else
 			texMode= NormalTextureMode;
+
 		// -1 is important to indicate we set this value in edit mode
 		NLGUI::CDBManager::getInstance()->getDbProp( GAME_CONFIG_TEXTURE_MODE_DB )->setValue32(-1);
 		NLGUI::CDBManager::getInstance()->getDbProp( GAME_CONFIG_TEXTURE_MODE_DB )->setValue32(texMode);
@@ -3485,7 +3487,7 @@ class CHandlerGameConfigApply : public IActionHandler
 
 		// *** Apply the language code
 		// only if not in "work" language mode (else strange requestReboot)
-		if(ClientCfg.LanguageCode!="wk")
+		if (ClientCfg.LanguageCode!="wk")
 		{
 			sint newOne = NLGUI::CDBManager::getInstance()->getDbProp( GAME_CONFIG_LANGUAGE )->getValue32();
 			//string newVal = (newOne==2)?"de":(newOne==1)?"fr":"en";
diff --git a/code/ryzom/client/src/main_loop.h b/code/ryzom/client/src/main_loop.h
index 93e4db36d..79ebc69fa 100644
--- a/code/ryzom/client/src/main_loop.h
+++ b/code/ryzom/client/src/main_loop.h
@@ -59,30 +59,9 @@ void displayDebugUIUnderMouse();
 void inGamePatchUncompleteWarning();
 
 
-// active/desactive bloom config interface
+// enable/disable bloom config interface
 void initBloomConfigUI();
 
 #endif // CL_MAIN_LOOP_H
 
 /* End of main_loop.h */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-