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

Changed: Use of getRyzomModes

Browse source
This commit is contained in:
kervala 2010-10-19 14:22:10 +02:00
parent 4b98f936e7
commit b589d48e4b
2 changed files with 6 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2904,59 +2904,10 @@ public:
{ {
if (Driver == NULL) return; if (Driver == NULL) return;
// **** Init Video Modes
VideoModes.clear(); VideoModes.clear();
Driver->getModes(VideoModes);
// Remove modes under 800x600 and get the unique string
vector<string> stringModeList; vector<string> stringModeList;
sint i, j, nFoundMode = -1;
for (i=0; i < (sint)VideoModes.size(); ++i)
{
if ((VideoModes[i].Width < 800) || (VideoModes[i].Height < 600))
{
VideoModes.erase(VideoModes.begin()+i);
--i;
}
else
{
bool bFound = false;
string tmp = toString(VideoModes[i].Width)+" x "+toString(VideoModes[i].Height);
for (j = 0; j < (sint)stringModeList.size(); ++j)
if (stringModeList[j] == tmp)
{
bFound = true;
break;
}
if (!bFound)
{
stringModeList.push_back(tmp);
if ((VideoModes[i].Width <= ClientCfg.Width) && (VideoModes[i].Height <= ClientCfg.Height))
{
if (nFoundMode == -1)
{
nFoundMode = j;
}
else
{
if ((VideoModes[i].Width >= VideoModes[nFoundMode].Width) &&
(VideoModes[i].Height >= VideoModes[nFoundMode].Height))
nFoundMode = j;
}
}
}
}
}
// If no modes are available, display a message and exit sint nFoundMode = getRyzomModes(VideoModes, stringModeList);
if (!ClientCfg.Windowed && nFoundMode == -1)
{
Driver->systemMessageBox("No Video Modes available!\n"
"Minimum Video mode to play Ryzom is 800x600.\n",
"No Video Mode!",
NL3D::UDriver::okType,
NL3D::UDriver::exclamationIcon);
exit(EXIT_SUCCESS);
}
// Initialize interface combo box // Initialize interface combo box
CInterfaceManager *pIM = CInterfaceManager::getInstance(); CInterfaceManager *pIM = CInterfaceManager::getInstance();
@ -2964,7 +2915,7 @@ public:
if( pCB ) if( pCB )
{ {
pCB->resetTexts(); pCB->resetTexts();
for (j = 0; j < (sint)stringModeList.size(); j++) for (sint j = 0; j < (sint)stringModeList.size(); j++)
pCB->addText(ucstring(stringModeList[j])); pCB->addText(ucstring(stringModeList[j]));
} }
// -1 is important to indicate we set this value in edit mode // -1 is important to indicate we set this value in edit mode

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

@ -31,6 +31,7 @@
#include "nel/net/tcp_sock.h" #include "nel/net/tcp_sock.h"
#include "nel/3d/u_driver.h" #include "nel/3d/u_driver.h"
#include "nel/misc/big_file.h"
#include "interface_v3/interface_manager.h" #include "interface_v3/interface_manager.h"
#include "interface_v3/input_handler_manager.h" #include "interface_v3/input_handler_manager.h"
@ -1893,61 +1894,11 @@ class CAHInitResLod : public IActionHandler
//nlinfo("CAHInitResLod called"); //nlinfo("CAHInitResLod called");
if (Driver == NULL) return; if (Driver == NULL) return;
// **** Init Video Modes
VideoModes.clear(); VideoModes.clear();
Driver->getModes(VideoModes); StringModeList.clear();
StringModeList.push_back("uiConfigWindowed"); StringModeList.push_back("uiConfigWindowed");
// Remove modes under 800x600 and get the unique strings
sint i, j;
for (i=0; i < (sint)VideoModes.size(); ++i)
{
if ((VideoModes[i].Width < 800) || (VideoModes[i].Height < 600))
{
VideoModes.erase(VideoModes.begin()+i);
--i;
}
else
{
bool bFound = false;
string tmp = toString(VideoModes[i].Width)+" x "+toString(VideoModes[i].Height);
for (j = 0; j < (sint)StringModeList.size(); ++j)
{
if (StringModeList[j] == tmp)
{
bFound = true;
break;
}
}
if (!bFound)
{
StringModeList.push_back(tmp);
if ((VideoModes[i].Width <= ClientCfg.Width) && (VideoModes[i].Height <= ClientCfg.Height))
{
if (CurrentMode == -1)
{
CurrentMode = j;
}
else
{
if ((VideoModes[i].Width >= VideoModes[CurrentMode].Width) &&
(VideoModes[i].Height >= VideoModes[CurrentMode].Height))
CurrentMode = j;
}
}
}
}
}
// If no modes are available, display a message and exit CurrentMode = getRyzomModes(VideoModes, StringModeList);
if (VideoModes.empty())
{
Driver->systemMessageBox("No Video Modes available!\n"
"Minimum Video mode to play Ryzom is 800x600.\n",
"No Video Mode!",
NL3D::UDriver::okType,
NL3D::UDriver::exclamationIcon);
exit(EXIT_SUCCESS);
}
// 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)