aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-14 03:09:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Minor changes

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2015-12-02 18:55:31 +01:00
parent 532f8c502f
commit d8102a8c67
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)

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

@ -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);

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 */