|
|
|
@ -333,8 +333,8 @@ void ExitClientError (const char *format, ...)
|
|
|
|
|
// Exit
|
|
|
|
|
extern void quitCrashReport ();
|
|
|
|
|
quitCrashReport ();
|
|
|
|
|
NLMISC::NL3D_BlockMemoryAssertOnPurge = false; // at this point some object may remain allocated
|
|
|
|
|
// so don't want to fire an assert here
|
|
|
|
|
NLMISC::NL3D_BlockMemoryAssertOnPurge = false; // at this point some object may remain allocated
|
|
|
|
|
// so don't want to fire an assert here
|
|
|
|
|
exit (EXIT_FAILURE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -558,11 +558,11 @@ static std::string replaceApplicationDirToken(const std::string &dir)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
#ifdef NL_OS_MAC
|
|
|
|
|
// if client_default.cfg is not in current directory, and it's not an absolute path, use application default directory
|
|
|
|
|
if (!CFile::isExists("client_default.cfg") && dir.size()>0 && dir[0]!='/')
|
|
|
|
|
{
|
|
|
|
|
return getAppBundlePath() + "/Contents/Resources/" + dir;
|
|
|
|
|
}
|
|
|
|
|
// if client_default.cfg is not in current directory, and it's not an absolute path, use application default directory
|
|
|
|
|
if (!CFile::isExists("client_default.cfg") && dir.size()>0 && dir[0]!='/')
|
|
|
|
|
{
|
|
|
|
|
return getAppBundlePath() + "/Contents/Resources/" + dir;
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
static const std::string token = "<ApplicationDir>";
|
|
|
|
|
std::string::size_type pos = dir.find(token);
|
|
|
|
@ -695,7 +695,7 @@ void addPreDataPaths(NLMISC::IProgressCallback &progress)
|
|
|
|
|
{
|
|
|
|
|
NLMISC::TTime initPaths = ryzomGetLocalTime ();
|
|
|
|
|
H_AUTO(InitRZAddSearchPaths)
|
|
|
|
|
for (uint i = 0; i < ClientCfg.PreDataPath.size(); i++)
|
|
|
|
|
for (uint i = 0; i < ClientCfg.PreDataPath.size(); i++)
|
|
|
|
|
{
|
|
|
|
|
progress.progress ((float)i/(float)ClientCfg.PreDataPath.size());
|
|
|
|
|
progress.pushCropedValues ((float)i/(float)ClientCfg.PreDataPath.size(), (float)(i+1)/(float)ClientCfg.PreDataPath.size());
|
|
|
|
@ -771,7 +771,7 @@ void prelogInit()
|
|
|
|
|
NLMISC_REGISTER_CLASS(CNamedEntityPositionState);
|
|
|
|
|
NLMISC_REGISTER_CLASS(CAnimalPositionState);
|
|
|
|
|
|
|
|
|
|
// _CrtSetDbgFlag( _CRTDBG_CHECK_CRT_DF );
|
|
|
|
|
// _CrtSetDbgFlag( _CRTDBG_CHECK_CRT_DF );
|
|
|
|
|
|
|
|
|
|
// Init XML Lib allocator
|
|
|
|
|
// Due to Bug #906, we disable the stl xml allocation
|
|
|
|
@ -924,9 +924,9 @@ void prelogInit()
|
|
|
|
|
|
|
|
|
|
// For login phase, MUST be in windowed
|
|
|
|
|
UDriver::CMode mode;
|
|
|
|
|
mode.Width = 1024;
|
|
|
|
|
mode.Height = 768;
|
|
|
|
|
mode.Windowed = true;
|
|
|
|
|
mode.Width = 1024;
|
|
|
|
|
mode.Height = 768;
|
|
|
|
|
mode.Windowed = true;
|
|
|
|
|
|
|
|
|
|
// Disable Hardware Vertex Program.
|
|
|
|
|
if(ClientCfg.DisableVtxProgram)
|
|
|
|
@ -944,7 +944,7 @@ void prelogInit()
|
|
|
|
|
else
|
|
|
|
|
Driver->setSwapVBLInterval(0);
|
|
|
|
|
|
|
|
|
|
if (StereoDisplay) // VR_CONFIG // VR_DRIVER
|
|
|
|
|
if (StereoDisplay) // VR_CONFIG // VR_DRIVER
|
|
|
|
|
{
|
|
|
|
|
// override mode TODO
|
|
|
|
|
}
|
|
|
|
@ -1000,7 +1000,7 @@ void prelogInit()
|
|
|
|
|
|
|
|
|
|
// check if an icon is present in registered paths
|
|
|
|
|
if(CPath::exists("ryzom.png"))
|
|
|
|
|
filenames.push_back(CPath::lookup("ryzom.png"));
|
|
|
|
|
filenames.push_back(CPath::lookup("ryzom.png"));
|
|
|
|
|
|
|
|
|
|
vector<CBitmap> bitmaps;
|
|
|
|
|
|
|
|
|
|