Bounds

[xonotic/darkplaces.git] / sys_sdl.c

diff --git a/sys_sdl.c b/sys_sdl.c
index 4a908537cce4c72f4c56ac3efae71c0481a0c43e..af4777b40fe3c244dd1c3a8a21f401567b2f7f7e 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,6 +1,10 @@
 #include "quakedef.h"
 
 #ifdef WIN32
+#ifdef _MSC_VER
+#pragma comment(lib, "sdl.lib")
+#pragma comment(lib, "sdlmain.lib")
+#endif
 #include <io.h>
 #include "conio.h"
 #else
@@ -69,37 +73,6 @@ void Sys_PrintToTerminal(const char *text)
        //fprintf(stdout, "%s", text);
 }
 
-double Sys_DoubleTime (void)
-{
-       static int first = true;
-       static double oldtime = 0.0, curtime = 0.0;
-       double newtime;
-       newtime = (double) SDL_GetTicks() / 1000.0;
-
-
-       if (first)
-       {
-               first = false;
-               oldtime = newtime;
-       }
-
-       if (newtime < oldtime)
-       {
-               // warn if it's significant
-               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;
-
-       return curtime;
-}
-
 char *Sys_ConsoleInput(void)
 {
        if (cls.state == ca_dedicated)
@@ -160,11 +133,6 @@ char *Sys_ConsoleInput(void)
        return NULL;
 }
 
-void Sys_Sleep(int microseconds)
-{
-       SDL_Delay(microseconds / 1000);
-}
-
 char *Sys_GetClipboardData (void)
 {
 #ifdef WIN32
@@ -198,16 +166,13 @@ void Sys_InitConsole (void)
 {
 }
 
-void Sys_Init_Commands (void)
-{
-}
-
 int main (int argc, char *argv[])
 {
        signal(SIGFPE, SIG_IGN);
 
        com_argc = argc;
        com_argv = (const char **)argv;
+       Sys_ProvideSelfFD();
 
 #ifndef WIN32
        fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
@@ -220,3 +185,13 @@ int main (int argc, char *argv[])
 
        return 0;
 }
+
+qboolean sys_supportsdlgetticks = true;
+unsigned int Sys_SDL_GetTicks (void)
+{
+       return SDL_GetTicks();
+}
+void Sys_SDL_Delay (unsigned int milliseconds)
+{
+       SDL_Delay(milliseconds);
+}