... 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 d7ed9179f717e3f73231ba240cd7474897ad81c8..4a908537cce4c72f4c56ac3efae71c0481a0c43e 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -53,6 +53,8 @@ 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)
        {
@@ -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;
                                }
@@ -156,8 +162,6 @@ char *Sys_ConsoleInput(void)
 
 void Sys_Sleep(int microseconds)
 {
-       if (microseconds < 1000)
-               microseconds = 1000;
        SDL_Delay(microseconds / 1000);
 }
 
@@ -173,11 +177,11 @@ char *Sys_GetClipboardData (void)
 
                if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
                {
-                       if ((cliptext = GlobalLock (hClipboardData)) != 0)
+                       if ((cliptext = (char *)GlobalLock (hClipboardData)) != 0)
                        {
                                size_t allocsize;
                                allocsize = GlobalSize (hClipboardData) + 1;
-                               data = Z_Malloc (allocsize);
+                               data = (char *)Z_Malloc (allocsize);
                                strlcpy (data, cliptext, allocsize);
                                GlobalUnlock (hClipboardData);
                        }