Merge MR 'Make trace entity culling optional for spectators'

[xonotic/darkplaces.git] / sys_sdl.c

diff --git a/sys_sdl.c b/sys_sdl.c
index 982956b1bd942a22ef1016f61fe845390b57ccf6..1bf22cd08463c11279ddb3a70c93252a38994e9e 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,7 +1,5 @@
-#include "darkplaces.h"
-
 #ifdef WIN32
-#include <io.h>
+#include <io.h> // Include this BEFORE darkplaces.h because it uses strncpy which trips DP_STATIC_ASSERT
 #include "conio.h"
 #else
 #include <unistd.h>
@@ -15,8 +13,14 @@
 
 #include <signal.h>
 
+/*
+ * Include this BEFORE darkplaces.h because it breaks wrapping
+ * _Static_assert. Cloudwalk has no idea how or why so don't ask.
+ */
 #include <SDL.h>
 
+#include "darkplaces.h"
+
 #ifdef WIN32
 #ifdef _MSC_VER
 #pragma comment(lib, "sdl2.lib")
@@ -62,11 +66,11 @@ void Sys_Error (const char *error, ...)
        if(!nocrashdialog)
                SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Engine Error", string, NULL);
 
-       Host_Shutdown ();
+       //Host_Shutdown ();
        exit (1);
 }
 
-void Sys_PrintToTerminal(const char *text)
+void Sys_Print(const char *text)
 {
 #ifdef __ANDROID__
        if (developer.integer > 0)
@@ -103,61 +107,58 @@ void Sys_PrintToTerminal(const char *text)
 
 char *Sys_ConsoleInput(void)
 {
-//     if (cls.state == ca_dedicated)
-       {
-               static char text[MAX_INPUTLINE];
-               int len = 0;
+       static char text[MAX_INPUTLINE];
+       int len = 0;
 #ifdef WIN32
-               int c;
+       int c;
 
-               // read a line out
-               while (_kbhit ())
+       // read a line out
+       while (_kbhit ())
+       {
+               c = _getch ();
+               _putch (c);
+               if (c == '\r')
                {
-                       c = _getch ();
-                       _putch (c);
-                       if (c == '\r')
+                       text[len] = 0;
+                       _putch ('\n');
+                       len = 0;
+                       return text;
+               }
+               if (c == 8)
+               {
+                       if (len)
                        {
+                               _putch (' ');
+                               _putch (c);
+                               len--;
                                text[len] = 0;
-                               _putch ('\n');
-                               len = 0;
-                               return text;
-                       }
-                       if (c == 8)
-                       {
-                               if (len)
-                               {
-                                       _putch (' ');
-                                       _putch (c);
-                                       len--;
-                                       text[len] = 0;
-                               }
-                               continue;
                        }
-                       text[len] = c;
-                       len++;
-                       text[len] = 0;
-                       if (len == sizeof (text))
-                               len = 0;
+                       continue;
                }
+               text[len] = c;
+               len++;
+               text[len] = 0;
+               if (len == sizeof (text))
+                       len = 0;
+       }
 #else
-               fd_set fdset;
-               struct timeval timeout;
-               FD_ZERO(&fdset);
-               FD_SET(0, &fdset); // stdin
-               timeout.tv_sec = 0;
-               timeout.tv_usec = 0;
-               if (select (1, &fdset, NULL, NULL, &timeout) != -1 && FD_ISSET(0, &fdset))
+       fd_set fdset;
+       struct timeval timeout;
+       FD_ZERO(&fdset);
+       FD_SET(0, &fdset); // stdin
+       timeout.tv_sec = 0;
+       timeout.tv_usec = 0;
+       if (select (1, &fdset, NULL, NULL, &timeout) != -1 && FD_ISSET(0, &fdset))
+       {
+               len = read (0, text, sizeof(text));
+               if (len >= 1)
                {
-                       len = read (0, text, sizeof(text));
-                       if (len >= 1)
-                       {
-                               // rip off the \n and terminate
-                               text[len-1] = 0;
-                               return text;
-                       }
+                       // rip off the \n and terminate
+                       text[len-1] = 0;
+                       return text;
                }
-#endif
        }
+#endif
        return NULL;
 }
 
@@ -178,10 +179,6 @@ char *Sys_GetClipboardData (void)
        return data;
 }
 
-void Sys_InitConsole (void)
-{
-}
-
 int main (int argc, char *argv[])
 {
        signal(SIGFPE, SIG_IGN);