... forgot to add the files, I'm too used to git now :P

[xonotic/darkplaces.git] / sys_sdl.c

diff --git a/sys_sdl.c b/sys_sdl.c
index 3833fdad9308fec02e1e6d0419fd78f077205a35..4a908537cce4c72f4c56ac3efae71c0481a0c43e 100644 (file)
--- 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>
 
 // =======================================================================
@@ -53,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)
        {
-               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;
@@ -87,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;
@@ -107,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;
                        }
@@ -119,8 +125,8 @@ char *Sys_ConsoleInput(void)
                        {
                                if (len)
                                {
-                                       putch (' ');
-                                       putch (c);
+                                       _putch (' ');
+                                       _putch (c);
                                        len--;
                                        text[len] = 0;
                                }
@@ -154,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)
@@ -173,10 +177,12 @@ char *Sys_GetClipboardData (void)
 
                if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
                {
-                       if ((cliptext = GlobalLock (hClipboardData)) != 0)
+                       if ((cliptext = (char *)GlobalLock (hClipboardData)) != 0)
                        {
-                               data = malloc (GlobalSize(hClipboardData)+1);
-                               strcpy (data, cliptext);
+                               size_t allocsize;
+                               allocsize = GlobalSize (hClipboardData) + 1;
+                               data = (char *)Z_Malloc (allocsize);
+                               strlcpy (data, cliptext, allocsize);
                                GlobalUnlock (hClipboardData);
                        }
                }
@@ -198,8 +204,6 @@ void Sys_Init_Commands (void)
 
 int main (int argc, char *argv[])
 {
-       double frameoldtime, framenewtime;
-
        signal(SIGFPE, SIG_IGN);
 
        com_argc = argc;
@@ -209,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;
 }