X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_win.c;h=de1f47187c2e0f766414bebf630c3d62cdcae9ed;hp=ee6ef061c219b4204a388f0cd41c62f32c44a2d0;hb=1ff3bc8e953680793a28ea923f2d1e58cdf2c9f0;hpb=5a28d87102f9d33a8f62094274ac13f0a44f832a

diff --git a/sys_win.c b/sys_win.c
index ee6ef061..de1f4718 100644
--- a/sys_win.c
+++ b/sys_win.c
@@ -19,18 +19,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sys_win.c -- Win32 system interface code
 
-#include "quakedef.h"
 #include <windows.h>
 #include <mmsystem.h>
+#include <direct.h>
 #ifdef SUPPORTDIRECTX
 #include <dsound.h>
 #endif
-#include "errno.h"
+
+#include "qtypes.h"
+
+#include "quakedef.h"
+#include <errno.h>
 #include "resource.h"
 #include "conproc.h"
-#include "direct.h"
-
-cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1", "use windows timeGetTime function (which has issues on some motherboards) for timing rather than QueryPerformanceCounter timer (which has issues on multicore/multiprocessor machines and processors which are designed to conserve power)"};
 
 HANDLE				hinput, houtput;
 
@@ -119,93 +120,6 @@ void Sys_PrintToTerminal(const char *text)
 		WriteFile(houtput, text, (DWORD) strlen(text), &dummy, NULL);
 }
 
-/*
-================
-Sys_DoubleTime
-================
-*/
-double Sys_DoubleTime (void)
-{
-	static int first = true;
-	static double oldtime = 0.0, curtime = 0.0;
-	double newtime;
-	// LordHavoc: note to people modifying this code, DWORD is specifically defined as an unsigned 32bit number, therefore the 65536.0 * 65536.0 is fine.
-	if (sys_usetimegettime.integer)
-	{
-		static int firsttimegettime = true;
-		// timeGetTime
-		// platform:
-		// Windows 95/98/ME/NT/2000/XP
-		// features:
-		// reasonable accuracy (millisecond)
-		// issues:
-		// wraps around every 47 days or so (but this is non-fatal to us, odd times are rejected, only causes a one frame stutter)
-
-		// make sure the timer is high precision, otherwise different versions of windows have varying accuracy
-		if (firsttimegettime)
-		{
-			timeBeginPeriod (1);
-			firsttimegettime = false;
-		}
-
-		newtime = (double) timeGetTime () / 1000.0;
-	}
-	else
-	{
-		// QueryPerformanceCounter
-		// platform:
-		// Windows 95/98/ME/NT/2000/XP
-		// features:
-		// very accurate (CPU cycles)
-		// known issues:
-		// does not necessarily match realtime too well (tends to get faster and faster in win98)
-		// wraps around occasionally on some platforms (depends on CPU speed and probably other unknown factors)
-		double timescale;
-		LARGE_INTEGER PerformanceFreq;
-		LARGE_INTEGER PerformanceCount;
-
-		if (!QueryPerformanceFrequency (&PerformanceFreq))
-		{
-			Con_Printf ("No hardware timer available\n");
-			// fall back to timeGetTime
-			Cvar_SetValueQuick(&sys_usetimegettime, true);
-			return Sys_DoubleTime();
-		}
-		QueryPerformanceCounter (&PerformanceCount);
-
-		#ifdef __BORLANDC__
-		timescale = 1.0 / ((double) PerformanceFreq.u.LowPart + (double) PerformanceFreq.u.HighPart * 65536.0 * 65536.0);
-		newtime = ((double) PerformanceCount.u.LowPart + (double) PerformanceCount.u.HighPart * 65536.0 * 65536.0) * timescale;
-		#else
-		timescale = 1.0 / ((double) PerformanceFreq.LowPart + (double) PerformanceFreq.HighPart * 65536.0 * 65536.0);
-		newtime = ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale;
-		#endif
-	}
-
-	if (first)
-	{
-		first = false;
-		oldtime = newtime;
-	}
-
-	if (newtime < oldtime)
-	{
-		// warn if it's significant
-		if (newtime - oldtime < -0.01)
-			Con_Printf("Sys_DoubleTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime);
-	}
-	else if (newtime > oldtime + 1800)
-	{
-		Con_Printf("Sys_DoubleTime: time stepped forward (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime);
-	}
-	else
-		curtime += newtime - oldtime;
-	oldtime = newtime;
-
-	return curtime;
-}
-
-
 char *Sys_ConsoleInput (void)
 {
 	static char text[MAX_INPUTLINE];
@@ -286,11 +200,6 @@ char *Sys_ConsoleInput (void)
 	return NULL;
 }
 
-void Sys_Sleep(int microseconds)
-{
-	Sleep(microseconds / 1000);
-}
-
 char *Sys_GetClipboardData (void)
 {
 	char *data = NULL;
@@ -302,11 +211,11 @@ char *Sys_GetClipboardData (void)
 
 		if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
 		{
-			if ((cliptext = GlobalLock (hClipboardData)) != 0)
+			if ((cliptext = (char *)GlobalLock (hClipboardData)) != 0)
 			{
 				size_t allocsize;
 				allocsize = GlobalSize (hClipboardData) + 1;
-				data = Z_Malloc (allocsize);
+				data = (char *)Z_Malloc (allocsize);
 				strlcpy (data, cliptext, allocsize);
 				GlobalUnlock (hClipboardData);
 			}
@@ -377,11 +286,6 @@ void Sys_InitConsole (void)
 	S_BlockSound ();
 }
 
-void Sys_Init_Commands (void)
-{
-	Cvar_RegisterVariable(&sys_usetimegettime);
-}
-
 /*
 ==============================================================================
 
@@ -454,6 +358,8 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 		}
 	}
 
+	Sys_ProvideSelfFD();
+
 	Host_Main();
 
 	/* return success of application */
@@ -483,3 +389,13 @@ int main (int argc, const char* argv[])
 }
 #endif
 
+qboolean sys_supportsdlgetticks = false;
+unsigned int Sys_SDL_GetTicks (void)
+{
+	Sys_Error("Called Sys_SDL_GetTicks on non-SDL target");
+	return 0;
+}
+void Sys_SDL_Delay (unsigned int milliseconds)
+{
+	Sys_Error("Called Sys_SDL_Delay on non-SDL target");
+}