X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=982956b1bd942a22ef1016f61fe845390b57ccf6;hb=e775691c81f0bcb3b4f85bdfb771e1a4ebbc6b30;hp=e3b2956edafe19a3c9ba40e72a1a3104e14c6964;hpb=0118a30eba01aef1ad0bbab03c383b382acad183;p=xonotic%2Fdarkplaces.git

diff --git a/sys_sdl.c b/sys_sdl.c
index e3b2956e..982956b1 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,3 +1,4 @@
+#include "darkplaces.h"
 
 #ifdef WIN32
 #include <io.h>
@@ -10,10 +11,6 @@
 
 #ifdef __ANDROID__
 #include <android/log.h>
-
-#ifndef FNDELAY
-#define FNDELAY		O_NDELAY
-#endif
 #endif
 
 #include <signal.h>
@@ -27,7 +24,7 @@
 #endif
 #endif
 
-#include "quakedef.h"
+sys_t sys;
 
 // =======================================================================
 // General routines
@@ -39,13 +36,13 @@ void Sys_Shutdown (void)
 	Sys_AllowProfiling(false);
 #endif
 #ifndef WIN32
-	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
+	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
 #endif
 	fflush(stdout);
 	SDL_Quit();
 }
 
-static qboolean nocrashdialog;
+static qbool nocrashdialog;
 void Sys_Error (const char *error, ...)
 {
 	va_list argptr;
@@ -53,14 +50,14 @@ void Sys_Error (const char *error, ...)
 
 // change stdin to non blocking
 #ifndef WIN32
-	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
+	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
 #endif
 
 	va_start (argptr,error);
 	dpvsnprintf (string, sizeof (string), error, argptr);
 	va_end (argptr);
 
-	Con_Errorf ("Engine Error: %s\n", string);
+	Con_Printf(CON_ERROR "Engine Error: %s\n", string);
 	
 	if(!nocrashdialog)
 		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Engine Error", string, NULL);
@@ -69,36 +66,35 @@ void Sys_Error (const char *error, ...)
 	exit (1);
 }
 
-static int outfd = 1;
 void Sys_PrintToTerminal(const char *text)
 {
 #ifdef __ANDROID__
 	if (developer.integer > 0)
 	{
-		__android_log_write(ANDROID_LOG_DEBUG, com_argv[0], text);
+		__android_log_write(ANDROID_LOG_DEBUG, sys.argv[0], text);
 	}
 #else
-	if(outfd < 0)
+	if(sys.outfd < 0)
 		return;
-#ifdef FNDELAY
+#ifndef WIN32
 	// BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
 	// this is because both go to /dev/tty by default!
 	{
-		int origflags = fcntl (outfd, F_GETFL, 0);
-		fcntl (outfd, F_SETFL, origflags & ~FNDELAY);
+		int origflags = fcntl (sys.outfd, F_GETFL, 0);
+		fcntl (sys.outfd, F_SETFL, origflags & ~O_NONBLOCK);
 #endif
 #ifdef WIN32
 #define write _write
 #endif
 		while(*text)
 		{
-			fs_offset_t written = (fs_offset_t)write(outfd, text, (int)strlen(text));
+			fs_offset_t written = (fs_offset_t)write(sys.outfd, text, (int)strlen(text));
 			if(written <= 0)
 				break; // sorry, I cannot do anything about this error - without an output
 			text += written;
 		}
-#ifdef FNDELAY
-		fcntl (outfd, F_SETFL, origflags);
+#ifndef WIN32
+		fcntl (sys.outfd, F_SETFL, origflags);
 	}
 #endif
 	//fprintf(stdout, "%s", text);
@@ -194,8 +190,9 @@ int main (int argc, char *argv[])
 	Sys_AllowProfiling(true);
 #endif
 
-	com_argc = argc;
-	com_argv = (const char **)argv;
+	sys.selffd = -1;
+	sys.argc = argc;
+	sys.argv = (const char **)argv;
 
 	// Sys_Error this early in startup might screw with automated
 	// workflows or something if we show the dialog by default.
@@ -204,30 +201,35 @@ 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"))
-		outfd = -1;
+	if(Sys_CheckParm("-noterminal"))
+		sys.outfd = -1;
 	// COMMANDLINEOPTION: sdl: -stderr moves console output to stderr
-	else if(COM_CheckParm("-stderr"))
-		outfd = 2;
+	else if(Sys_CheckParm("-stderr"))
+		sys.outfd = 2;
 	else
-		outfd = 1;
+		sys.outfd = 1;
 
 #ifndef WIN32
-	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
+	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NONBLOCK);
 #endif
 
 	// we don't know which systems we'll want to init, yet...
 	SDL_Init(0);
 
+	// used by everything
+	Memory_Init();
+
 	Host_Main();
 
+	Sys_Quit(0);
+	
 	return 0;
 }
 
-qboolean sys_supportsdlgetticks = true;
+qbool sys_supportsdlgetticks = true;
 unsigned int Sys_SDL_GetTicks (void)
 {
 	return SDL_GetTicks();