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

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2015-11-09 12:47:24 +01:00
commit cdab63fb2c
3 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/3d/driver/opengl/stdopengl.h
View file

@ -101,9 +101,9 @@
#include "nel/3d/index_buffer.h" #include "nel/3d/index_buffer.h"
#ifdef NL_OS_MAC #ifdef NL_OS_MAC
#include <AvailabilityMacros.h>
#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 #if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
#define NL_MAC_VERSION_10_6_UP #define NL_MAC_VERSION_10_6_UP
#else
#endif #endif
#endif #endif

5
code/ryzom/client/src/client.cpp
View file

@ -366,6 +366,11 @@ int main(int argc, char **argv)
// init the Nel context // init the Nel context
CApplicationContext *appContext = new CApplicationContext; CApplicationContext *appContext = new CApplicationContext;
// disable nldebug messages in logs in Release
#ifdef NL_RELEASE
DisableNLDebug = true;
#endif
createDebug(); createDebug();
INelContext::getInstance().setWindowedApplication(true); INelContext::getInstance().setWindowedApplication(true);

18
code/ryzom/client/src/misc.cpp
View file

@ -1477,14 +1477,30 @@ bool getRyzomModes(std::vector<NL3D::UDriver::CMode> &videoModes, std::vector<st
if (videoModes[i].Width == videoModes[nFoundMode].Width && videoModes[i].Height == videoModes[nFoundMode].Height) if (videoModes[i].Width == videoModes[nFoundMode].Width && videoModes[i].Height == videoModes[nFoundMode].Height)
{ {
uint freq = videoModes[i].Frequency; uint freq = videoModes[i].Frequency;
std::string freqStr = toString(freq);
bool bFound = false;
// check if frequency already found in list
for (j = 0; j < (sint)stringFreqList.size(); ++j)
{
if (stringFreqList[j] == freqStr)
{
bFound = true;
break;
}
}
if (!bFound)
{
// if frequency is 0, take the first one else use the exact one // if frequency is 0, take the first one else use the exact one
if (nFoundStringFreq == -1 && ((ClientCfg.Frequency == 0) || (freq == ClientCfg.Frequency))) if (nFoundStringFreq == -1 && ((ClientCfg.Frequency == 0) || (freq == ClientCfg.Frequency)))
{ {
nFoundStringFreq = stringFreqList.size(); nFoundStringFreq = stringFreqList.size();
} }
stringFreqList.push_back(toString(freq)); stringFreqList.push_back(freqStr);
}
} }
} }
} }