aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-29 20:30:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged in nimetu/ryzomcore (pull request #28)

Browse source 
Fixed: restore correct resolution
This commit is contained in:
Cédric OCHS 2013-09-27 20:07:08 +02:00
commit 349b8a8b55
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/ryzom/client/src/login.cpp
View file

@ -1943,16 +1943,21 @@ class CAHInitResLod : public IActionHandler
VideoModes.clear(); VideoModes.clear();
StringModeList.clear(); StringModeList.clear();
StringModeList.push_back("uiConfigWindowed");
CurrentMode = getRyzomModes(VideoModes, StringModeList); CurrentMode = getRyzomModes(VideoModes, StringModeList);
// getRyzomModes() expects empty list, so we need to insert 'Windowed' after mode list is filled
StringModeList.insert(StringModeList.begin(), "uiConfigWindowed");
// If the client is in windowed mode, still in windowed mode and do not change anything // If the client is in windowed mode, still in windowed mode and do not change anything
if (ClientCfg.Windowed) if (ClientCfg.Windowed)
CurrentMode = 0; CurrentMode = 0;
// If we have not found the mode so it can be an error or machine change, so propose the first available // If we have not found the mode so it can be an error or machine change, so propose the first available
else if (CurrentMode == -1) else if (CurrentMode == -1)
CurrentMode = 1; CurrentMode = 1;
// We inserted 'Windowed' as first mode, so index needs to move too
else
++CurrentMode;
CInterfaceManager *pIM = CInterfaceManager::getInstance(); CInterfaceManager *pIM = CInterfaceManager::getInstance();
CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:checkpass:content:res_value")); CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:checkpass:content:res_value"));

2
code/ryzom/client/src/release.cpp
View file

@ -468,8 +468,6 @@ void releaseOutGame()
// flush the server string cache // flush the server string cache
STRING_MANAGER::CStringManagerClient::instance()->flushStringCache(); STRING_MANAGER::CStringManagerClient::instance()->flushStringCache();
ClientCfg.release ();
// Disconnect the client from the server. // Disconnect the client from the server.
NetMngr.disconnect(); NetMngr.disconnect();