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

diff --git a/sys_sdl.c b/sys_sdl.c
index d18b4b6e..6ca78129 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,3 +1,4 @@
+#include "quakedef.h"
 
 #ifdef WIN32
 #include <io.h>
@@ -10,8 +11,6 @@
 
 #include <signal.h>
 
-#include "quakedef.h"
-
 #include <SDL.h>
 
 // =======================================================================
@@ -54,10 +53,12 @@ void Sys_PrintToTerminal(const char *text)
 	// BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
 	int origflags = fcntl (1, F_GETFL, 0);
 	fcntl (1, F_SETFL, origflags & ~FNDELAY);
+#else
+#define write _write
 #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;
@@ -88,6 +89,10 @@ double Sys_DoubleTime (void)
 		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;
@@ -108,11 +113,11 @@ char *Sys_ConsoleInput(void)
 		while (_kbhit ())
 		{
 			c = _getch ();
-			putch (c);
+			_putch (c);
 			if (c == '\r')
 			{
 				text[len] = 0;
-				putch ('\n');
+				_putch ('\n');
 				len = 0;
 				return text;
 			}
@@ -120,8 +125,8 @@ char *Sys_ConsoleInput(void)
 			{
 				if (len)
 				{
-					putch (' ');
-					putch (c);
+					_putch (' ');
+					_putch (c);
 					len--;
 					text[len] = 0;
 				}
@@ -155,11 +160,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)
@@ -176,8 +179,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 +204,6 @@ void Sys_Init_Commands (void)
 
 int main (int argc, char *argv[])
 {
-	double frameoldtime, framenewtime;
-
 	signal(SIGFPE, SIG_IGN);
 
 	com_argc = argc;
@@ -210,17 +213,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_Main();
 
-		Host_Frame (framenewtime - frameoldtime);
-
-		frameoldtime = framenewtime;
-	}
 	return 0;
 }