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

Changed: #927 Move OS specific code from client or server to NeL when it's possible

Browse source
This commit is contained in:
kervala 2010-06-05 19:59:22 +02:00
parent 7cb2d2e09e
commit 3117e5fd5f
4 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/client/src/interface_v3/action_handler_outpost.cpp
View file

@ -684,9 +684,7 @@ public:
return; return;
// *** must update time zone, in case of user changed it during play // *** must update time zone, in case of user changed it during play
#ifdef NL_OS_WINDOWS tzset();
_tzset();
#endif
// *** Get the difference of time => timezone // *** Get the difference of time => timezone
time_t tGmt=0, tLocal=0; time_t tGmt=0, tLocal=0;

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

@ -734,7 +734,7 @@ void initLoginScreen()
ClientApp = ClientCfg.ConfigFile.getVar("Application").asString(0); ClientApp = ClientCfg.ConfigFile.getVar("Application").asString(0);
CSystemUtils::setRootKey("SOFTWARE\\Nevrax\\Ryzom"); CSystemUtils::setRootKey("Software\\Nevrax\\Ryzom");
string l = CSystemUtils::getRegKey("Login"); string l = CSystemUtils::getRegKey("Login");

19
code/ryzom/client/src/r2/editor.cpp
View file

@ -3076,12 +3076,8 @@ void CEditor::reset()
if (ClientCfg.R2EDExtendedDebug) if (ClientCfg.R2EDExtendedDebug)
{ {
Driver->setWindowTitle(CI18N::get("TheSagaOfRyzom")); Driver->setWindowTitle(CI18N::get("TheSagaOfRyzom"));
Driver->showWindow();
// TODO: check
// Get the window
// Show the window // Show the window
// ShowWindow (hWnd, SW_SHOW); Driver->showWindow();
// SetForegroundWindow(hWnd);
} }
getUI().displaySystemInfo(CI18N::get("uiR2EDEditorReseted"), "BC"); getUI().displaySystemInfo(CI18N::get("uiR2EDEditorReseted"), "BC");
@ -4491,24 +4487,12 @@ void CEditor::updatePreCamera()
{ {
//H_AUTO(R2_CEditor_updatePreCamera) //H_AUTO(R2_CEditor_updatePreCamera)
/*
#ifdef NL_DEBUG
#ifdef NL_OS_WINDOWS
_CrtCheckMemory();
#endif
#endif
*/
if (_Mode == EditionMode) if (_Mode == EditionMode)
{ {
static uint32 loop = 0; static uint32 loop = 0;
++loop; ++loop;
if (loop % 200 == 0) // minimal wait between to save = 20 seconds if (loop % 200 == 0) // minimal wait between to save = 20 seconds
{ {
if ( (CTime::getLocalTime() -_LastAutoSaveTime)/1000 > ClientCfg.R2EDAutoSaveWait) // 5 minutes if not change in Confile if ( (CTime::getLocalTime() -_LastAutoSaveTime)/1000 > ClientCfg.R2EDAutoSaveWait) // 5 minutes if not change in Confile
{ {
autoSave(); autoSave();
@ -4525,7 +4509,6 @@ void CEditor::updatePreCamera()
_DMC->getActionHistoric().flushPendingAction(); _DMC->getActionHistoric().flushPendingAction();
} }
} }
} }
// ********************************************************************************************************* // *********************************************************************************************************

2
code/ryzom/tools/leveldesign/georges_exe/georges_exe.rc
View file

@ -7,7 +7,7 @@
// //
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include "afxres.h" #include <windows.h>
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS