Khaganat-NeL/khanat-opennel-code
1
0
Fork 0
Code Issues 21 Pull requests Packages Projects Releases 1 Wiki Activity

Changed: Minor changes

Browse source
This commit is contained in:
kervala 2015-12-02 18:55:31 +01:00
parent 5a4f7a3757
commit e96f954a87
3 changed files with 8 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/ryzom/client/src/init_main_loop.cpp
View file

@ -1340,10 +1340,10 @@ void initMainLoop()
// init CSessionBrowserImpl // init CSessionBrowserImpl
CSessionBrowserImpl::getInstance().init(CLuaManager::getInstance().getLuaState()); CSessionBrowserImpl::getInstance().init(CLuaManager::getInstance().getLuaState());
// active/desactive welcome window // enable/disable welcome window
initWelcomeWindow(); initWelcomeWindow();
// active/desactive bloom config interface // enable/disable bloom config interface
initBloomConfigUI(); initBloomConfigUI();
// popup to offer hardware cursor activation // popup to offer hardware cursor activation
@ -1364,7 +1364,7 @@ void destroyLoadingBitmap ()
// Destroy the Loading Background. // Destroy the Loading Background.
Driver->deleteTextureFile(LoadingBitmap); Driver->deleteTextureFile(LoadingBitmap);
LoadingBitmap = NULL; LoadingBitmap = NULL;
LoadingBitmapFilename = ""; LoadingBitmapFilename.clear();
LoadingMaterial.setTexture (0, NULL); LoadingMaterial.setTexture (0, NULL);
} }
if (LoadingBitmapFull && Driver) if (LoadingBitmapFull && Driver)

6
code/ryzom/client/src/interface_v3/action_handler_game.cpp
View file

@ -3034,7 +3034,7 @@ public:
// **** Init Texture Size Modes // **** Init Texture Size Modes
// init the combo box, according to Texture Installed or not // 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 ) if( pCB )
{ {
pCB->resetTexts(); pCB->resetTexts();
@ -3050,6 +3050,7 @@ public:
{ {
pBut->setPushed(ClientCfg.VREnable); pBut->setPushed(ClientCfg.VREnable);
} }
updateVRDevicesComboUI(ClientCfg.VREnable); updateVRDevicesComboUI(ClientCfg.VREnable);
// init the mode in DB // init the mode in DB
@ -3060,6 +3061,7 @@ public:
texMode= HighTextureMode; texMode= HighTextureMode;
else else
texMode= NormalTextureMode; texMode= NormalTextureMode;
// -1 is important to indicate we set this value in edit mode // -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(-1);
NLGUI::CDBManager::getInstance()->getDbProp( GAME_CONFIG_TEXTURE_MODE_DB )->setValue32(texMode); NLGUI::CDBManager::getInstance()->getDbProp( GAME_CONFIG_TEXTURE_MODE_DB )->setValue32(texMode);
@ -3485,7 +3487,7 @@ class CHandlerGameConfigApply : public IActionHandler
// *** Apply the language code // *** Apply the language code
// only if not in "work" language mode (else strange requestReboot) // 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(); sint newOne = NLGUI::CDBManager::getInstance()->getDbProp( GAME_CONFIG_LANGUAGE )->getValue32();
//string newVal = (newOne==2)?"de":(newOne==1)?"fr":"en"; //string newVal = (newOne==2)?"de":(newOne==1)?"fr":"en";

23
code/ryzom/client/src/main_loop.h
View file

@ -59,30 +59,9 @@ void displayDebugUIUnderMouse();
void inGamePatchUncompleteWarning(); void inGamePatchUncompleteWarning();
// active/desactive bloom config interface // enable/disable bloom config interface
void initBloomConfigUI(); void initBloomConfigUI();
#endif // CL_MAIN_LOOP_H #endif // CL_MAIN_LOOP_H
/* End of main_loop.h */ /* End of main_loop.h */