From fa5e8c99b624d344f6ab7bcbff288a9250736140 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sat, 5 Jun 2010 19:59:22 +0200
Subject: [PATCH] Changed: #927 Move OS specific code from client or server to
 NeL when it's possible

---
 .../interface_v3/action_handler_outpost.cpp   |  4 +---
 code/ryzom/client/src/login.cpp               |  2 +-
 code/ryzom/client/src/r2/editor.cpp           | 19 +------------------
 .../leveldesign/georges_exe/georges_exe.rc    |  2 +-
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/code/ryzom/client/src/interface_v3/action_handler_outpost.cpp b/code/ryzom/client/src/interface_v3/action_handler_outpost.cpp
index beb24608c..8d8aaec9d 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_outpost.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_outpost.cpp
@@ -684,9 +684,7 @@ public:
 			return;
 
 		// *** must update time zone, in case of user changed it during play
-#ifdef NL_OS_WINDOWS
-		_tzset();
-#endif
+		tzset();
 
 		// *** Get the difference of time => timezone
 		time_t	tGmt=0, tLocal=0;
diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp
index 9f8f5c3bf..81de7e8e8 100644
--- a/code/ryzom/client/src/login.cpp
+++ b/code/ryzom/client/src/login.cpp
@@ -734,7 +734,7 @@ void initLoginScreen()
 
 	ClientApp = ClientCfg.ConfigFile.getVar("Application").asString(0);
 
-	CSystemUtils::setRootKey("SOFTWARE\\Nevrax\\Ryzom");
+	CSystemUtils::setRootKey("Software\\Nevrax\\Ryzom");
 
 	string l = CSystemUtils::getRegKey("Login");
 
diff --git a/code/ryzom/client/src/r2/editor.cpp b/code/ryzom/client/src/r2/editor.cpp
index db355193c..bb7679f07 100644
--- a/code/ryzom/client/src/r2/editor.cpp
+++ b/code/ryzom/client/src/r2/editor.cpp
@@ -3076,12 +3076,8 @@ void CEditor::reset()
 	if (ClientCfg.R2EDExtendedDebug)
 	{
 		Driver->setWindowTitle(CI18N::get("TheSagaOfRyzom"));
-		Driver->showWindow();
-		// TODO: check
-		// Get the window
 		// Show the window
-//		ShowWindow (hWnd, SW_SHOW);
-//		SetForegroundWindow(hWnd);
+		Driver->showWindow();
 	}
 
 	getUI().displaySystemInfo(CI18N::get("uiR2EDEditorReseted"), "BC");
@@ -4491,24 +4487,12 @@ void CEditor::updatePreCamera()
 {
 	//H_AUTO(R2_CEditor_updatePreCamera)
 
-	/*
-	#ifdef NL_DEBUG
-		#ifdef NL_OS_WINDOWS
-			_CrtCheckMemory();
-		#endif
-	#endif
-	*/
-
-
-
 	if (_Mode == EditionMode)
 	{
-
 		static uint32 loop = 0;
 		++loop;
 		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
 			{
 				autoSave();
@@ -4525,7 +4509,6 @@ void CEditor::updatePreCamera()
 			_DMC->getActionHistoric().flushPendingAction();
 		}
 	}
-
 }
 
 // *********************************************************************************************************
diff --git a/code/ryzom/tools/leveldesign/georges_exe/georges_exe.rc b/code/ryzom/tools/leveldesign/georges_exe/georges_exe.rc
index 34601716e..b2d0d350a 100644
--- a/code/ryzom/tools/leveldesign/georges_exe/georges_exe.rc
+++ b/code/ryzom/tools/leveldesign/georges_exe/georges_exe.rc
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include <windows.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS