X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=a6bff96315790a871e6e6af9046285c0f55401a9;hb=8e7b42d509d36c9bdda23487612ff1ca8c139b1d;hp=50cca9d99d5688c2e3442caf963f04e8bfbcfe3a;hpb=2aea7e90b7eba8a916b93880f4fa3f2360944587;p=xonotic%2Fdarkplaces.git

diff --git a/sys_sdl.c b/sys_sdl.c
index 50cca9d9..a6bff963 100644
--- 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")
@@ -59,14 +63,16 @@ void Sys_Error (const char *error, ...)
 
 	Con_Printf(CON_ERROR "Engine Error: %s\n", string);
 	
+	// don't want a dead window left blocking the OS UI or the crash dialog
+	Host_Shutdown();
+
 	if(!nocrashdialog)
 		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Engine Error", string, NULL);
 
-	//Host_Shutdown ();
 	exit (1);
 }
 
-void Sys_PrintToTerminal(const char *text)
+void Sys_Print(const char *text)
 {
 #ifdef __ANDROID__
 	if (developer.integer > 0)
@@ -175,10 +181,6 @@ char *Sys_GetClipboardData (void)
 	return data;
 }
 
-void Sys_InitConsole (void)
-{
-}
-
 int main (int argc, char *argv[])
 {
 	signal(SIGFPE, SIG_IGN);