]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - sys_win.c
Added CTRL+V paste into the console for win32 users.
[xonotic/darkplaces.git] / sys_win.c
index a7f21401318f46288313024988d98f267096b0b6..8e3c628f850ef06d14d2beb96aa4fee1db77458e 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -20,189 +20,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // sys_win.c -- Win32 system interface code
 
 #include "quakedef.h"
-#include "winquake.h"
+#include <windows.h>
+#include <dsound.h>
 #include "errno.h"
 #include "resource.h"
 #include "conproc.h"
 #include "direct.h"
 
-#define CONSOLE_ERROR_TIMEOUT  60.0    // # of seconds to wait on Sys_Error running
-                                                                               //  dedicated before exiting
-#define PAUSE_SLEEP            50                              // sleep time on pause or minimization
-#define NOT_FOCUS_SLEEP        20                              // sleep time when not focus
+extern void S_BlockSound (void);
 
-int                    starttime;
-qboolean       ActiveApp, Minimized;
-qboolean       WinNT;
+cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
+
+// # of seconds to wait on Sys_Error running dedicated before exiting
+#define CONSOLE_ERROR_TIMEOUT  60.0
+// sleep time on pause or minimization
+#define PAUSE_SLEEP            50
+// sleep time when not focus
+#define NOT_FOCUS_SLEEP        20
 
-static double          pfreq;
-static double          curtime = 0.0;
-static double          lastcurtime = 0.0;
-static int                     lowshift;
-qboolean                       isDedicated;
 static qboolean                sc_return_on_enter = false;
 HANDLE                         hinput, houtput;
 
-static char                    *tracking_tag = "Clams & Mooses";
-
 static HANDLE  tevent;
 static HANDLE  hFile;
 static HANDLE  heventParent;
 static HANDLE  heventChild;
 
-void Sys_InitFloatTime (void);
-
-volatile int                                   sys_checksum;
-
-
-/*
-================
-Sys_PageIn
-================
-*/
-/*
-void Sys_PageIn (void *ptr, int size)
-{
-       byte    *x;
-       int             m, n;
-
-// touch all the memory to make sure it's there. The 16-page skip is to
-// keep Win 95 from thinking we're trying to page ourselves in (we are
-// doing that, of course, but there's no reason we shouldn't)
-       x = (byte *)ptr;
-
-       for (n=0 ; n<4 ; n++)
-       {
-               for (m=0 ; m<(size - 16 * 0x1000) ; m += 4)
-               {
-                       sys_checksum += *(int *)&x[m];
-                       sys_checksum += *(int *)&x[m + 16 * 0x1000];
-               }
-       }
-}
-*/
-
-
-/*
-===============================================================================
-
-FILE IO
-
-===============================================================================
-*/
-
-// LordHavoc: 256 pak files (was 10)
-#define        MAX_HANDLES             256
-FILE   *sys_handles[MAX_HANDLES];
-
-int            findhandle (void)
-{
-       int             i;
-       
-       for (i=1 ; i<MAX_HANDLES ; i++)
-               if (!sys_handles[i])
-                       return i;
-       Sys_Error ("out of handles");
-       return -1;
-}
-
-/*
-================
-filelength
-================
-*/
-int filelength (FILE *f)
-{
-       int             pos;
-       int             end;
-
-       pos = ftell (f);
-       fseek (f, 0, SEEK_END);
-       end = ftell (f);
-       fseek (f, pos, SEEK_SET);
-
-       return end;
-}
-
-int Sys_FileOpenRead (char *path, int *hndl)
-{
-       FILE    *f;
-       int             i, retval;
-
-       i = findhandle ();
-
-       f = fopen(path, "rb");
-
-       if (!f)
-       {
-               *hndl = -1;
-               retval = -1;
-       }
-       else
-       {
-               sys_handles[i] = f;
-               *hndl = i;
-               retval = filelength(f);
-       }
-
-       return retval;
-}
-
-int Sys_FileOpenWrite (char *path)
-{
-       FILE    *f;
-       int             i;
-
-       i = findhandle ();
-
-       f = fopen(path, "wb");
-       if (!f)
-               Host_Error ("Error opening %s: %s", path,strerror(errno));
-       sys_handles[i] = f;
-       
-       return i;
-}
-
-void Sys_FileClose (int handle)
-{
-       fclose (sys_handles[handle]);
-       sys_handles[handle] = NULL;
-}
-
-void Sys_FileSeek (int handle, int position)
-{
-       fseek (sys_handles[handle], position, SEEK_SET);
-}
-
-int Sys_FileRead (int handle, void *dest, int count)
-{
-       return fread (dest, 1, count, sys_handles[handle]);
-}
-
-int Sys_FileWrite (int handle, void *data, int count)
-{
-       return fwrite (data, 1, count, sys_handles[handle]);
-}
-
-int    Sys_FileTime (char *path)
-{
-       FILE    *f;
-       
-       f = fopen(path, "rb");
-       if (f)
-       {
-               fclose(f);
-               return 1;
-       }
-       
-       return -1;
-}
-
-void Sys_mkdir (char *path)
-{
-       _mkdir (path);
-}
-
 
 /*
 ===============================================================================
@@ -212,137 +55,27 @@ SYSTEM IO
 ===============================================================================
 */
 
-#if NOTUSED
-/*
-================
-Sys_MakeCodeWriteable
-================
-*/
-void Sys_MakeCodeWriteable (unsigned long startaddr, unsigned long length)
-{
-       DWORD  flOldProtect;
+void SleepUntilInput (int time);
 
-       if (!VirtualProtect((LPVOID)startaddr, length, PAGE_READWRITE, &flOldProtect))
-               Sys_Error("Protection change failed\n");
-}
-#endif
-
-
-/*
-================
-Sys_Init
-================
-*/
-void Sys_Init (void)
-{
-       LARGE_INTEGER   PerformanceFreq;
-       unsigned int    lowpart, highpart;
-       OSVERSIONINFO   vinfo;
-
-       if (!QueryPerformanceFrequency (&PerformanceFreq))
-               Sys_Error ("No hardware timer available");
-
-// get 32 out of the 64 time bits such that we have around
-// 1 microsecond resolution
-#ifdef __BORLANDC__
-       lowpart = (unsigned int)PerformanceFreq.u.LowPart;
-       highpart = (unsigned int)PerformanceFreq.u.HighPart;
-#else
-       lowpart = (unsigned int)PerformanceFreq.LowPart;
-       highpart = (unsigned int)PerformanceFreq.HighPart;
-#endif 
-        lowshift = 0;
-
-       while (highpart || (lowpart > 2000000.0))
-       {
-               lowshift++;
-               lowpart >>= 1;
-               lowpart |= (highpart & 1) << 31;
-               highpart >>= 1;
-       }
-
-       pfreq = 1.0 / (double)lowpart;
-
-       Sys_InitFloatTime ();
-
-       vinfo.dwOSVersionInfoSize = sizeof(vinfo);
-
-       if (!GetVersionEx (&vinfo))
-               Sys_Error ("Couldn't get OS info");
-
-       if ((vinfo.dwMajorVersion < 4) ||
-               (vinfo.dwPlatformId == VER_PLATFORM_WIN32s))
-       {
-               Sys_Error ("WinQuake requires at least Win95 or NT 4.0");
-       }
-
-       if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
-               WinNT = true;
-       else
-               WinNT = false;
-}
-
-
-void Sys_Error (char *error, ...)
+void Sys_Error (const char *error, ...)
 {
        va_list         argptr;
-       char            text[1024], text2[1024];
-       char            *text3 = "Press Enter to exit\n";
-       char            *text4 = "***********************************\n";
-       char            *text5 = "\n";
-       DWORD           dummy;
-       double          starttime;
+       char            text[1024];
        static int      in_sys_error0 = 0;
        static int      in_sys_error1 = 0;
        static int      in_sys_error2 = 0;
-       static int      in_sys_error3 = 0;
-
-       if (!in_sys_error3)
-               in_sys_error3 = 1;
 
        va_start (argptr, error);
-       vsprintf (text, error, argptr);
+       vsnprintf (text, sizeof (text), error, argptr);
        va_end (argptr);
 
-       if (isDedicated)
+       // close video so the message box is visible, unless we already tried that
+       if (!in_sys_error0 && cls.state != ca_dedicated)
        {
-               va_start (argptr, error);
-               vsprintf (text, error, argptr);
-               va_end (argptr);
-
-               sprintf (text2, "ERROR: %s\n", text);
-               WriteFile (houtput, text5, strlen (text5), &dummy, NULL);
-               WriteFile (houtput, text4, strlen (text4), &dummy, NULL);
-               WriteFile (houtput, text2, strlen (text2), &dummy, NULL);
-               WriteFile (houtput, text3, strlen (text3), &dummy, NULL);
-               WriteFile (houtput, text4, strlen (text4), &dummy, NULL);
-
-
-               starttime = Sys_FloatTime ();
-               sc_return_on_enter = true;      // so Enter will get us out of here
-
-               while (!Sys_ConsoleInput () &&
-                               ((Sys_FloatTime () - starttime) < CONSOLE_ERROR_TIMEOUT))
-               {
-               }
-       }
-       else
-       {
-       // switch to windowed so the message box is visible, unless we already
-       // tried that and failed
-               if (!in_sys_error0)
-               {
-                       in_sys_error0 = 1;
-                       VID_SetDefaultMode ();
-                       MessageBox(NULL, text, "Quake Error",
-                                          MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
-               }
-               else
-               {
-                       MessageBox(NULL, text, "Double Quake Error",
-                                          MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
-               }
+               in_sys_error0 = 1;
+               VID_Shutdown();
        }
+       MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
 
        if (!in_sys_error1)
        {
@@ -360,143 +93,113 @@ void Sys_Error (char *error, ...)
        exit (1);
 }
 
-void Sys_Printf (char *fmt, ...)
+void Sys_Shutdown (void)
 {
-       va_list         argptr;
-       char            text[1024];
-       DWORD           dummy;
-       
-       if (isDedicated)
-       {
-               va_start (argptr,fmt);
-               vsprintf (text, fmt, argptr);
-               va_end (argptr);
-
-               WriteFile(houtput, text, strlen (text), &dummy, NULL);  
-       }
-}
-
-void Sys_Quit (void)
-{
-
-       Host_Shutdown();
-
        if (tevent)
                CloseHandle (tevent);
 
-       if (isDedicated)
+       if (cls.state == ca_dedicated)
                FreeConsole ();
 
 // shut down QHOST hooks if necessary
        DeinitConProc ();
-
-       exit (0);
 }
 
+void Sys_PrintToTerminal(const char *text)
+{
+       DWORD dummy;
+       extern HANDLE houtput;
+       if (cls.state == ca_dedicated)
+               WriteFile(houtput, text, strlen (text), &dummy, NULL);
+}
 
 /*
 ================
-Sys_FloatTime
+Sys_DoubleTime
 ================
 */
-double Sys_FloatTime (void)
+double Sys_DoubleTime (void)
 {
-       static int                      sametimecount;
-       static unsigned int     oldtime;
-       static int                      first = 1;
-       LARGE_INTEGER           PerformanceCount;
-       unsigned int            temp, t2;
-       double                          time;
-
-       QueryPerformanceCounter (&PerformanceCount);
-
-#ifdef __BORLANDC__
-       temp = ((unsigned int)PerformanceCount.u.LowPart >> lowshift) |
-           ((unsigned int)PerformanceCount.u.HighPart << (32 - lowshift));
-#else
-
-       temp = ((unsigned int)PerformanceCount.LowPart >> lowshift) |
-                  ((unsigned int)PerformanceCount.HighPart << (32 - lowshift));
-#endif
-       if (first)
+       static int first = true;
+       static double oldtime = 0.0, curtime = 0.0;
+       double newtime;
+       // LordHavoc: note to people modifying this code, DWORD is specifically defined as an unsigned 32bit number, therefore the 65536.0 * 65536.0 is fine.
+       if (sys_usetimegettime.integer)
        {
-               oldtime = temp;
-               first = 0;
-       }
-       else
-       {
-       // check for turnover or backward time
-               if ((temp <= oldtime) && ((oldtime - temp) < 0x10000000))
+               static int firsttimegettime = true;
+               // timeGetTime
+               // platform:
+               // Windows 95/98/ME/NT/2000/XP
+               // features:
+               // reasonable accuracy (millisecond)
+               // issues:
+               // wraps around every 47 days or so (but this is non-fatal to us, odd times are rejected, only causes a one frame stutter)
+
+               // make sure the timer is high precision, otherwise different versions of windows have varying accuracy
+               if (firsttimegettime)
                {
-                       oldtime = temp; // so we can't get stuck
+                       timeBeginPeriod (1);
+                       firsttimegettime = false;
                }
-               else
-               {
-                       t2 = temp - oldtime;
-
-                       time = (double)t2 * pfreq;
-                       oldtime = temp;
 
-                       curtime += time;
-
-                       if (curtime == lastcurtime)
-                       {
-                               sametimecount++;
-
-                               if (sametimecount > 100000)
-                               {
-                                       curtime += 1.0;
-                                       sametimecount = 0;
-                               }
-                       }
-                       else
-                       {
-                               sametimecount = 0;
-                       }
-
-                       lastcurtime = curtime;
-               }
+               newtime = (double) timeGetTime () / 1000.0;
+       }
+       else
+       {
+               // QueryPerformanceCounter
+               // platform:
+               // Windows 95/98/ME/NT/2000/XP
+               // features:
+               // very accurate (CPU cycles)
+               // known issues:
+               // does not necessarily match realtime too well (tends to get faster and faster in win98)
+               // wraps around occasionally on some platforms (depends on CPU speed and probably other unknown factors)
+               double timescale;
+               LARGE_INTEGER PerformanceFreq;
+               LARGE_INTEGER PerformanceCount;
+
+               if (!QueryPerformanceFrequency (&PerformanceFreq))
+                       Sys_Error ("No hardware timer available");
+               QueryPerformanceCounter (&PerformanceCount);
+
+               #ifdef __BORLANDC__
+               timescale = 1.0 / ((double) PerformanceFreq.u.LowPart + (double) PerformanceFreq.u.HighPart * 65536.0 * 65536.0);
+               newtime = ((double) PerformanceCount.u.LowPart + (double) PerformanceCount.u.HighPart * 65536.0 * 65536.0) * timescale;
+               #else
+               timescale = 1.0 / ((double) PerformanceFreq.LowPart + (double) PerformanceFreq.HighPart * 65536.0 * 65536.0);
+               newtime = ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale;
+               #endif
        }
 
-    return curtime;
-}
-
-
-/*
-================
-Sys_InitFloatTime
-================
-*/
-void Sys_InitFloatTime (void)
-{
-       int             j;
-
-       Sys_FloatTime ();
-
-       j = COM_CheckParm("-starttime");
-
-       if (j)
+       if (first)
        {
-               curtime = (double) (atof(com_argv[j+1]));
+               first = false;
+               oldtime = newtime;
        }
-       else
+
+       if (newtime < oldtime)
        {
-               curtime = 0.0;
+               // 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
+               curtime += newtime - oldtime;
+       oldtime = newtime;
 
-       lastcurtime = curtime;
+       return curtime;
 }
 
 
 char *Sys_ConsoleInput (void)
 {
-       static char     text[256];
-       static int              len;
-       INPUT_RECORD    recs[1024];
-       int             dummy;
-       int             ch, numread, numevents;
+       static char text[256];
+       static int len;
+       INPUT_RECORD recs[1024];
+       int ch;
+       DWORD numread, numevents, dummy;
 
-       if (!isDedicated)
+       if (cls.state != ca_dedicated)
                return NULL;
 
 
@@ -523,7 +226,7 @@ char *Sys_ConsoleInput (void)
                                switch (ch)
                                {
                                        case '\r':
-                                               WriteFile(houtput, "\r\n", 2, &dummy, NULL);    
+                                               WriteFile(houtput, "\r\n", 2, &dummy, NULL);
 
                                                if (len)
                                                {
@@ -542,7 +245,7 @@ char *Sys_ConsoleInput (void)
                                                break;
 
                                        case '\b':
-                                               WriteFile(houtput, "\b \b", 3, &dummy, NULL);   
+                                               WriteFile(houtput, "\b \b", 3, &dummy, NULL);
                                                if (len)
                                                {
                                                        len--;
@@ -552,7 +255,7 @@ char *Sys_ConsoleInput (void)
                                        default:
                                                if (ch >= ' ')
                                                {
-                                                       WriteFile(houtput, &ch, 1, &dummy, NULL);       
+                                                       WriteFile(houtput, &ch, 1, &dummy, NULL);
                                                        text[len] = ch;
                                                        len = (len + 1) & 0xff;
                                                }
@@ -567,47 +270,47 @@ char *Sys_ConsoleInput (void)
        return NULL;
 }
 
-void Sys_Sleep (void)
+void Sys_Sleep(int milliseconds)
 {
-       Sleep (1);
+       if (milliseconds < 1)
+               milliseconds = 1;
+       Sleep(milliseconds);
 }
 
-
-void Sys_SendKeyEvents (void)
+char *Sys_GetClipboardData (void)
 {
-    MSG        msg;
+       char *data = NULL;
+       char *cliptext;
 
-       while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE))
+       if (OpenClipboard (NULL) != 0)
        {
-       // we always update if there are any event, even if we're paused
-               scr_skipupdate = 0;
-
-               if (!GetMessage (&msg, NULL, 0, 0))
-                       Sys_Quit ();
+               HANDLE hClipboardData;
 
-       TranslateMessage (&msg);
-       DispatchMessage (&msg);
+               if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
+               {
+                       if ((cliptext = GlobalLock (hClipboardData)) != 0) 
+                       {
+                               data = malloc (GlobalSize(hClipboardData)+1);
+                               strcpy (data, cliptext);
+                               GlobalUnlock (hClipboardData);
+                       }
+               }
+               CloseClipboard ();
        }
+       return data;
 }
 
-
 /*
 ==============================================================================
 
- WINDOWS CRAP
+WINDOWS CRAP
 
 ==============================================================================
 */
 
 
-/*
-==================
-WinMain
-==================
-*/
 void SleepUntilInput (int time)
 {
-
        MsgWaitForMultipleObjects(1, &tevent, false, time, QS_ALLINPUT);
 }
 
@@ -618,100 +321,89 @@ WinMain
 ==================
 */
 HINSTANCE      global_hInstance;
-int                    global_nCmdShow;
-char           *argv[MAX_NUM_ARGVS];
-static char    *empty_string = "";
+const char     *argv[MAX_NUM_ARGVS];
+char           program_name[MAX_OSPATH];
 
 int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
-       double                  time, oldtime, newtime/*, timediff*/;
-       MEMORYSTATUS    lpBuffer;
-       static  char    cwd[1024];
-       int                             t;
+       double frameoldtime, framenewtime;
+       MEMORYSTATUS lpBuffer;
+       int t;
 
-    /* previous instances do not exist in Win32 */
-    if (hPrevInstance)
-        return 0;
+       /* previous instances do not exist in Win32 */
+       if (hPrevInstance)
+               return 0;
 
        global_hInstance = hInstance;
-       global_nCmdShow = nCmdShow;
 
        lpBuffer.dwLength = sizeof(MEMORYSTATUS);
        GlobalMemoryStatus (&lpBuffer);
 
-       if (!GetCurrentDirectory (sizeof(cwd), cwd))
-               Sys_Error ("Couldn't determine current directory");
+       com_argc = 1;
+       program_name[sizeof(program_name)-1] = 0;
+       GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1);
+       argv[0] = program_name;
 
-       if (cwd[strlen(cwd)-1] == '/')
-               cwd[strlen(cwd)-1] = 0;
-
-       memset(&host_parms, 0, sizeof(host_parms));
-
-       host_parms.basedir = cwd;
-
-       host_parms.argc = 1;
-       argv[0] = empty_string;
-
-       while (*lpCmdLine && (host_parms.argc < MAX_NUM_ARGVS))
+       // FIXME: this tokenizer is rather redundent, call a more general one
+       while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS))
        {
-               while (*lpCmdLine && ((*lpCmdLine <= 32) || (*lpCmdLine > 126)))
+               while (*lpCmdLine && *lpCmdLine <= 32)
                        lpCmdLine++;
 
                if (*lpCmdLine)
                {
-                       argv[host_parms.argc] = lpCmdLine;
-                       host_parms.argc++;
-
-                       while (*lpCmdLine && ((*lpCmdLine > 32) && (*lpCmdLine <= 126)))
-                               lpCmdLine++;
-
-                       if (*lpCmdLine)
+                       if (*lpCmdLine == '\"')
                        {
-                               *lpCmdLine = 0;
-                               lpCmdLine++;
-                       }
-                       
-               }
-       }
-
-       host_parms.argv = argv;
-
-       COM_InitArgv (host_parms.argc, host_parms.argv);
+                               // quoted string
+                               argv[com_argc] = lpCmdLine;
+                               com_argc++;
 
-       host_parms.argc = com_argc;
-       host_parms.argv = com_argv;
+                               while (*lpCmdLine && (*lpCmdLine != '\"'))
+                                       lpCmdLine++;
 
-       isDedicated = (COM_CheckParm ("-dedicated") != 0);
+                               if (*lpCmdLine)
+                               {
+                                       *lpCmdLine = 0;
+                                       lpCmdLine++;
+                               }
 
-// take the greater of all the available memory or half the total memory,
-// but at least 8 Mb and no more than 16 Mb, unless they explicitly
-// request otherwise
-       /*
-       host_parms.memsize = lpBuffer.dwAvailPhys;
+                               if (*lpCmdLine == '\"')
+                                       lpCmdLine++;
+                       }
+                       else
+                       {
+                               // unquoted word
+                               argv[com_argc] = lpCmdLine;
+                               com_argc++;
 
-       if (host_parms.memsize < MINIMUM_WIN_MEMORY)
-               host_parms.memsize = MINIMUM_WIN_MEMORY;
+                               while (*lpCmdLine && *lpCmdLine > 32)
+                                       lpCmdLine++;
 
-       if (host_parms.memsize < (lpBuffer.dwTotalPhys >> 1))
-               host_parms.memsize = lpBuffer.dwTotalPhys >> 1;
+                               if (*lpCmdLine)
+                               {
+                                       *lpCmdLine = 0;
+                                       lpCmdLine++;
+                               }
+                       }
+               }
+       }
+       com_argv = argv;
 
-       if (host_parms.memsize > MAXIMUM_WIN_MEMORY)
-               host_parms.memsize = MAXIMUM_WIN_MEMORY;
-       */
+       Sys_Shared_EarlyInit();
 
-//     Sys_PageIn (parms.membase, parms.memsize);
+       Cvar_RegisterVariable(&sys_usetimegettime);
 
        tevent = CreateEvent(NULL, false, false, NULL);
 
        if (!tevent)
                Sys_Error ("Couldn't create event");
 
-       if (isDedicated)
+       // LordHavoc: can't check cls.state because it hasn't been initialized yet
+       // if (cls.state == ca_dedicated)
+       if (COM_CheckParm("-dedicated"))
        {
                if (!AllocConsole ())
-               {
                        Sys_Error ("Couldn't create dedicated server console");
-               }
 
                hinput = GetStdHandle (STD_INPUT_HANDLE);
                houtput = GetStdHandle (STD_OUTPUT_HANDLE);
@@ -722,13 +414,13 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
                        if (t < com_argc)
                                hFile = (HANDLE)atoi (com_argv[t+1]);
                }
-                       
+
                if ((t = COM_CheckParm ("-HPARENT")) > 0)
                {
                        if (t < com_argc)
                                heventParent = (HANDLE)atoi (com_argv[t+1]);
                }
-                       
+
                if ((t = COM_CheckParm ("-HCHILD")) > 0)
                {
                        if (t < com_argc)
@@ -738,67 +430,35 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
                InitConProc (hFile, heventParent, heventChild);
        }
 
-       Sys_Init ();
-
 // because sound is off until we become active
        S_BlockSound ();
 
-       Sys_Printf ("Host_Init\n");
        Host_Init ();
 
-       oldtime = Sys_FloatTime ();
+       Sys_Shared_LateInit();
 
-    /* main window message loop */
+       frameoldtime = Sys_DoubleTime ();
+       
+       /* main window message loop */
        while (1)
        {
-               if (isDedicated)
-               {
-                       newtime = Sys_FloatTime ();
-                       time = newtime - oldtime;
-
-                       while (time < sys_ticrate.value )
-                       {
-                               Sys_Sleep();
-                               newtime = Sys_FloatTime ();
-                               time = newtime - oldtime;
-                       }
-               }
-               else
+               if (cls.state != ca_dedicated)
                {
                // yield the CPU for a little while when paused, minimized, or not the focus
-                       if ((cl.paused && (!ActiveApp && !DDActive)) || Minimized)
+                       if ((cl.paused && !vid_activewindow) || vid_hidden)
                        {
                                SleepUntilInput (PAUSE_SLEEP);
                                scr_skipupdate = 1;             // no point in bothering to draw
                        }
-                       else if (!ActiveApp && !DDActive)
-                       {
+                       else if (!vid_activewindow)
                                SleepUntilInput (NOT_FOCUS_SLEEP);
-                       }
-                       /*
-                       else if (!cls.timedemo && time < (timediff = 1.0 / maxfps.value))
-                       {
-                               newtime = Sys_FloatTime ();
-                               time = newtime - oldtime;
-
-                               while (time < timediff)
-                               {
-                                       Sys_Sleep();
-                                       newtime = Sys_FloatTime ();
-                                       time = newtime - oldtime;
-                               }
-                       }
-                       */
-
-                       newtime = Sys_FloatTime ();
-                       time = newtime - oldtime;
                }
 
-               Host_Frame (time);
-               oldtime = newtime;
+               framenewtime = Sys_DoubleTime ();
+               Host_Frame (framenewtime - frameoldtime);
+               frameoldtime = framenewtime;
        }
 
-    /* return success of application */
-    return true;
+       /* return success of application */
+       return true;
 }
-