X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=bdefa12255a10eb0e7698774f034dffd80f527cb;hb=bdb63282edaaa746a60ce4f9ddcdd914a4c4395f;hp=fd3642f1d698fc6baf428ef2f1f3a18b3eecdf23;hpb=ff46d6ff516fda192c5adc55a5c9b82007545bd2;p=xonotic%2Fdarkplaces.git

diff --git a/sys_sdl.c b/sys_sdl.c
index fd3642f1..bdefa122 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -13,26 +13,20 @@
 
 #include <SDL.h>
 
-#ifdef WIN32
-cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
-#endif
-
-
-
 // =======================================================================
 // General routines
 // =======================================================================
 
-void Sys_Quit (void)
+void Sys_Shutdown (void)
 {
-	Host_Shutdown();
 #ifndef WIN32
 	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
 #endif
 	fflush(stdout);
-	exit(0);
+	SDL_Quit();
 }
 
+
 void Sys_Error (const char *error, ...)
 {
 	va_list argptr;
@@ -44,10 +38,14 @@ void Sys_Error (const char *error, ...)
 #endif
 
 	va_start (argptr,error);
-	vsnprintf (string, sizeof (string), error, argptr);
+	dpvsnprintf (string, sizeof (string), error, argptr);
 	va_end (argptr);
 	fprintf(stderr, "Error: %s\n", string);
 
+	Con_Print ("Quake Error: ");
+	Con_Print (string);
+	Con_Print ("\n");
+
 	Host_Shutdown ();
 	exit (1);
 }
@@ -62,59 +60,8 @@ double Sys_DoubleTime (void)
 	static int first = true;
 	static double oldtime = 0.0, curtime = 0.0;
 	double newtime;
-#ifdef WIN32
-	// 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) SDL_GetTicks() / 1000.0;
 
-		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))
-			Sys_Error ("No hardware timer available");
-		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
-	}
-#else
-	struct timeval tp;
-	gettimeofday(&tp, NULL);
-	newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0;
-#endif
 
 	if (first)
 	{
@@ -202,25 +149,56 @@ void Sys_Sleep(int milliseconds)
 	SDL_Delay(milliseconds);
 }
 
-int SDL_main (int argc, char *argv[])
+char *Sys_GetClipboardData (void)
+{
+#ifdef WIN32
+	char *data = NULL;
+	char *cliptext;
+
+	if (OpenClipboard (NULL) != 0)
+	{
+		HANDLE hClipboardData;
+
+		if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
+		{
+			if ((cliptext = GlobalLock (hClipboardData)) != 0)
+			{
+				data = malloc (GlobalSize(hClipboardData)+1);
+				strcpy (data, cliptext);
+				GlobalUnlock (hClipboardData);
+			}
+		}
+		CloseClipboard ();
+	}
+	return data;
+#else
+	return NULL;
+#endif
+}
+
+void Sys_InitConsole (void)
+{
+}
+
+void Sys_Init_Commands (void)
+{
+}
+
+int main (int argc, char *argv[])
 {
 	double frameoldtime, framenewtime;
 
 	signal(SIGFPE, SIG_IGN);
 
 	com_argc = argc;
-	com_argv = argv;
+	com_argv = (const char **)argv;
 
 #ifndef WIN32
 	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
 #endif
 
-	Sys_Shared_EarlyInit();
-
 	Host_Init();
 
-	Sys_Shared_LateInit();
-
 	frameoldtime = Sys_DoubleTime () - 0.1;
 	while (1)
 	{