X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=72c5953a6429ea823ab58a88662bb1084a2fe323;hb=82d0052f6cddbf9ac56bffb3528614dd26739b7d;hp=3833fdad9308fec02e1e6d0419fd78f077205a35;hpb=267196599b7ec2c80c47f1514b4f2f594fabe4af;p=xonotic%2Fdarkplaces.git

diff --git a/sys_sdl.c b/sys_sdl.c
index 3833fdad..72c5953a 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,5 +1,7 @@
+#include "quakedef.h"
 
 #ifdef WIN32
+#include <io.h>
 #include "conio.h"
 #else
 #include <unistd.h>
@@ -9,8 +11,6 @@
 
 #include <signal.h>
 
-#include "quakedef.h"
-
 #include <SDL.h>
 
 // =======================================================================
@@ -56,7 +56,7 @@ void Sys_PrintToTerminal(const char *text)
 #endif
 	while(*text)
 	{
-		ssize_t written = write(1, text, strlen(text));
+		int written = (int)write(1, text, (int)strlen(text));
 		if(written <= 0)
 			break; // sorry, I cannot do anything about this error - without an output
 		text += written;
@@ -154,11 +154,9 @@ char *Sys_ConsoleInput(void)
 	return NULL;
 }
 
-void Sys_Sleep(int milliseconds)
+void Sys_Sleep(int microseconds)
 {
-	if (milliseconds < 1)
-		milliseconds = 1;
-	SDL_Delay(milliseconds);
+	SDL_Delay(microseconds / 1000);
 }
 
 char *Sys_GetClipboardData (void)
@@ -175,8 +173,10 @@ char *Sys_GetClipboardData (void)
 		{
 			if ((cliptext = GlobalLock (hClipboardData)) != 0)
 			{
-				data = malloc (GlobalSize(hClipboardData)+1);
-				strcpy (data, cliptext);
+				size_t allocsize;
+				allocsize = GlobalSize (hClipboardData) + 1;
+				data = Z_Malloc (allocsize);
+				strlcpy (data, cliptext, allocsize);
 				GlobalUnlock (hClipboardData);
 			}
 		}
@@ -198,8 +198,6 @@ void Sys_Init_Commands (void)
 
 int main (int argc, char *argv[])
 {
-	double frameoldtime, framenewtime;
-
 	signal(SIGFPE, SIG_IGN);
 
 	com_argc = argc;
@@ -209,17 +207,10 @@ int main (int argc, char *argv[])
 	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
 #endif
 
-	Host_Init();
+	// we don't know which systems we'll want to init, yet...
+	SDL_Init(0);
 
-	frameoldtime = Sys_DoubleTime () - 0.1;
-	while (1)
-	{
-		// find time spent rendering last frame
-		framenewtime = Sys_DoubleTime ();
-
-		Host_Frame (framenewtime - frameoldtime);
+	Host_Main();
 
-		frameoldtime = framenewtime;
-	}
 	return 0;
 }