X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=c781cfed3cff43f632c862a2e312362ca5887a31;hb=6cdea2644603f8f6644976b73797f92b5f2e10c0;hp=d18b4b6e18d24dafe8226647e967827d19a2e559;hpb=62a118903c62ee0cd98698820ef30285aa2b4ab7;p=xonotic%2Fdarkplaces.git

diff --git a/sys_sdl.c b/sys_sdl.c
index d18b4b6e..c781cfed 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -57,7 +57,7 @@ void Sys_PrintToTerminal(const char *text)
 #endif
 	while(*text)
 	{
-		int written = (int)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;
@@ -155,11 +155,11 @@ char *Sys_ConsoleInput(void)
 	return NULL;
 }
 
-void Sys_Sleep(int milliseconds)
+void Sys_Sleep(int microseconds)
 {
-	if (milliseconds < 1)
-		milliseconds = 1;
-	SDL_Delay(milliseconds);
+	if (microseconds < 1000)
+		microseconds = 1000;
+	SDL_Delay(microseconds / 1000);
 }
 
 char *Sys_GetClipboardData (void)
@@ -176,8 +176,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);
 			}
 		}
@@ -199,8 +201,6 @@ void Sys_Init_Commands (void)
 
 int main (int argc, char *argv[])
 {
-	double frameoldtime, framenewtime;
-
 	signal(SIGFPE, SIG_IGN);
 
 	com_argc = argc;
@@ -210,17 +210,10 @@ int main (int argc, char *argv[])
 	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
 #endif
 
-	Host_Init();
-
-	frameoldtime = Sys_DoubleTime () - 0.1;
-	while (1)
-	{
-		// find time spent rendering last frame
-		framenewtime = Sys_DoubleTime ();
+	// we don't know which systems we'll want to init, yet...
+	SDL_Init(0);
 
-		Host_Frame (framenewtime - frameoldtime);
+	Host_Main();
 
-		frameoldtime = framenewtime;
-	}
 	return 0;
 }