diff --git a/code/nel/src/3d/nelu.cpp b/code/nel/src/3d/nelu.cpp index 721d6f1cb..535e80b70 100644 --- a/code/nel/src/3d/nelu.cpp +++ b/code/nel/src/3d/nelu.cpp @@ -61,15 +61,11 @@ bool CNELU::initDriver (uint w, uint h, uint bpp, bool windowed, nlWindow syst CNELU::Driver= CDRU::createD3DDriver(); } else +#endif // NL_OS_WINDOWS { CNELU::Driver= CDRU::createGlDriver(); } -#else // NL_OS_WINDOWS - CNELU::Driver= CDRU::createGlDriver(); - //CNELU::Driver= CDRU::createD3DDriver(); - -#endif // NL_OS_WINDOWS if (!CNELU::Driver->init()) { nlwarning ("CNELU::initDriver: init() failed"); diff --git a/code/nel/src/misc/file.cpp b/code/nel/src/misc/file.cpp index df36c17be..98ede1eb1 100644 --- a/code/nel/src/misc/file.cpp +++ b/code/nel/src/misc/file.cpp @@ -48,7 +48,6 @@ uint32 CIFile::_ReadingFromFile = 0; uint32 CIFile::_FileOpened = 0; uint32 CIFile::_FileRead = 0; CSynchronized > CIFile::_OpenedFiles(""); - // = CSynchronized >(""); // ====================================================================================================== CIFile::CIFile() : IStream(true) diff --git a/code/ryzom/client/src/far_tp.cpp b/code/ryzom/client/src/far_tp.cpp index 4d0483a38..a81198a8f 100644 --- a/code/ryzom/client/src/far_tp.cpp +++ b/code/ryzom/client/src/far_tp.cpp @@ -377,6 +377,7 @@ void CLoginStateMachine::run() { mustReboot = CPatchManager::getInstance()->mustLaunchBatFile(); } + if (mustReboot) { // skip eula and show reboot screen