X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_sdl.c;h=1bf22cd08463c11279ddb3a70c93252a38994e9e;hp=50186991e47ee30bfa67daf1fc66bef22286f879;hb=5c868d6b594c81a906b94cfea48328ae7cab37ba;hpb=b4ab81bedb237ddbf81675531e0c58b07ad6b07b

diff --git a/sys_sdl.c b/sys_sdl.c
index 50186991..1bf22cd0 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,6 +1,5 @@
-
 #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>
@@ -14,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")
@@ -23,8 +28,6 @@
 #endif
 #endif
 
-#include "quakedef.h"
-
 sys_t sys;
 
 // =======================================================================
@@ -43,7 +46,7 @@ void Sys_Shutdown (void)
 	SDL_Quit();
 }
 
-static qboolean nocrashdialog;
+static qbool nocrashdialog;
 void Sys_Error (const char *error, ...)
 {
 	va_list argptr;
@@ -63,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)
@@ -104,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;
 }
 
@@ -179,10 +179,6 @@ char *Sys_GetClipboardData (void)
 	return data;
 }
 
-void Sys_InitConsole (void)
-{
-}
-
 int main (int argc, char *argv[])
 {
 	signal(SIGFPE, SIG_IGN);
@@ -202,13 +198,13 @@ int main (int argc, char *argv[])
 	Sys_ProvideSelfFD();
 
 	// COMMANDLINEOPTION: -nocrashdialog disables "Engine Error" crash dialog boxes
-	if(!COM_CheckParm("-nocrashdialog"))
+	if(!Sys_CheckParm("-nocrashdialog"))
 		nocrashdialog = false;
 	// COMMANDLINEOPTION: sdl: -noterminal disables console output on stdout
-	if(COM_CheckParm("-noterminal"))
+	if(Sys_CheckParm("-noterminal"))
 		sys.outfd = -1;
 	// COMMANDLINEOPTION: sdl: -stderr moves console output to stderr
-	else if(COM_CheckParm("-stderr"))
+	else if(Sys_CheckParm("-stderr"))
 		sys.outfd = 2;
 	else
 		sys.outfd = 1;
@@ -230,7 +226,7 @@ int main (int argc, char *argv[])
 	return 0;
 }
 
-qboolean sys_supportsdlgetticks = true;
+qbool sys_supportsdlgetticks = true;
 unsigned int Sys_SDL_GetTicks (void)
 {
 	return SDL_GetTicks();