reworked transparency in palettes, made palette_complete be strictly opaque, added...

[xonotic/darkplaces.git] / sys_linux.c

diff --git a/sys_linux.c b/sys_linux.c
index ea91828fcc01419a788eca385eb510ff319ebc6b..9b6aa09e0c5b58fe594992581dda07ff944a0032 100644 (file)
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -32,7 +32,7 @@ void Sys_Shutdown (void)
 void Sys_Error (const char *error, ...)
 {
        va_list argptr;
-       char string[1024];
+       char string[MAX_INPUTLINE];
 
 // change stdin to non blocking
 #ifndef WIN32
@@ -40,13 +40,10 @@ void Sys_Error (const char *error, ...)
 #endif
 
        va_start (argptr,error);
-       vsnprintf (string, sizeof (string), error, argptr);
+       dpvsnprintf (string, sizeof (string), error, argptr);
        va_end (argptr);
-       fprintf(stderr, "Error: %s\n", string);
 
-       Con_Print ("Quake Error: ");
-       Con_Print (string);
-       Con_Print ("\n");
+       Con_Printf ("Quake Error: %s\n", string);
 
        Host_Shutdown ();
        exit (1);
@@ -54,7 +51,7 @@ void Sys_Error (const char *error, ...)
 
 void Sys_PrintToTerminal(const char *text)
 {
-       printf("%s", text);
+       fprintf(stdout, "%s", text);
 }
 
 double Sys_DoubleTime (void)
@@ -99,7 +96,12 @@ double Sys_DoubleTime (void)
                LARGE_INTEGER PerformanceCount;
 
                if (!QueryPerformanceFrequency (&PerformanceFreq))
-                       Sys_Error ("No hardware timer available");
+               {
+                       Con_Printf ("No hardware timer available\n");
+                       // fall back to timeGetTime
+                       Cvar_SetValueQuick(&sys_usetimegettime, true);
+                       return Sys_DoubleTime();
+               }
                QueryPerformanceCounter (&PerformanceCount);
 
                #ifdef __BORLANDC__
@@ -139,8 +141,8 @@ char *Sys_ConsoleInput(void)
 {
        if (cls.state == ca_dedicated)
        {
-               static char text[256];
-               static int len = 0;
+               static char text[MAX_INPUTLINE];
+               static unsigned int len = 0;
 #ifdef WIN32
                int c;
 
@@ -211,6 +213,14 @@ char *Sys_GetClipboardData (void)
        return NULL;
 }
 
+void Sys_InitConsole (void)
+{
+}
+
+void Sys_Init_Commands (void)
+{
+}
+
 int main (int argc, char **argv)
 {
        double frameoldtime, framenewtime;
@@ -224,12 +234,8 @@ int main (int argc, char **argv)
        fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
 #endif
 
-       Sys_Shared_EarlyInit();
-
        Host_Init();
 
-       Sys_Shared_LateInit();
-
        frameoldtime = Sys_DoubleTime () - 0.1;
        while (1)
        {