zym models are now loaded into the same structs as alias models in memory, this reduc...

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index 4114fdcd12743a8cfa07e0212c4c5c59fb6a0059..f53745e560ef2485da9e1631e1ac75ae2ad36e97 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -73,10 +73,14 @@ void Sys_Error (const char *error, ...)
        if (!in_sys_error0 && cls.state != ca_dedicated)
        {
                in_sys_error0 = 1;
-               VID_Shutdown();
+               VID_Shutdown();     
        }
        MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
 
+       Con_Print ("Quake Error: ");
+       Con_Print (text);
+       Con_Print ("\n");
+
        if (!in_sys_error1)
        {
                in_sys_error1 = 1;
@@ -93,10 +97,8 @@ void Sys_Error (const char *error, ...)
        exit (1);
 }
 
-void Sys_Quit (void)
+void Sys_Shutdown (void)
 {
-       Host_Shutdown();
-
        if (tevent)
                CloseHandle (tevent);
 
@@ -105,8 +107,6 @@ void Sys_Quit (void)
 
 // shut down QHOST hooks if necessary
        DeinitConProc ();
-
-       exit (0);
 }
 
 void Sys_PrintToTerminal(const char *text)
@@ -281,25 +281,29 @@ void Sys_Sleep(int milliseconds)
        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;
 }
 
-
 /*
 ==============================================================================
 
@@ -462,4 +466,3 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
        /* return success of application */
        return true;
 }
-