changed lots of printf to Con_Printf

[xonotic/darkplaces.git] / sys_shared.c

diff --git a/sys_shared.c b/sys_shared.c
index 0753133c0c6c0b3174f14093d7f312cf30f012c2..76c32fa751b5b7fdf5071e26b5f7ab085f8e144d 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -1,10 +1,14 @@
 
 #include "quakedef.h"
 #include <time.h>
-#ifndef WIN32
+#ifdef WIN32
+#include <direct.h>
+#else
+#include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #endif
+#include <errno.h>
 
 extern cvar_t  timestamps;
 extern cvar_t  timeformat;
@@ -43,7 +47,7 @@ static char qfont_table[256] = {
        'P',  'Q',  'R',  'S',  'T',  'U',  'V',  'W',
        'X',  'Y',  'Z',  '[',  '\\', ']',  '^',  '_',
        '`',  'a',  'b',  'c',  'd',  'e',  'f',  'g',
-       'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o', 
+       'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o',
        'p',  'q',  'r',  's',  't',  'u',  'v',  'w',
        'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<'
 };
@@ -53,7 +57,7 @@ extern HANDLE hinput, houtput;
 #endif
 
 #define MAX_PRINT_MSG  16384
-void Sys_Printf (char *fmt, ...)
+void Sys_Printf (const char *fmt, ...)
 {
        va_list         argptr;
        char            start[MAX_PRINT_MSG];   // String we started with
@@ -102,10 +106,142 @@ void Sys_Printf (char *fmt, ...)
 #endif
 }
 
+// LordHavoc: 256 pak files (was 10)
+#define MAX_HANDLES 256
+QFile *sys_handles[MAX_HANDLES];
+
+int findhandle (void)
+{
+       int i;
+
+       for (i = 1;i < MAX_HANDLES;i++)
+               if (!sys_handles[i])
+                       return i;
+       Sys_Error ("out of handles");
+       return -1;
+}
+
+/*
+================
+Sys_FileLength
+================
+*/
+int Sys_FileLength (QFile *f)
+{
+       int pos, end;
+
+       pos = Qtell (f);
+       Qseek (f, 0, SEEK_END);
+       end = Qtell (f);
+       Qseek (f, pos, SEEK_SET);
+
+       return end;
+}
+
+int Sys_FileOpenRead (const char *path, int *handle)
+{
+       QFile *f;
+       int i, retval;
+
+       i = findhandle ();
+
+       f = Qopen(path, "rbz");
+
+       if (!f)
+       {
+               *handle = -1;
+               retval = -1;
+       }
+       else
+       {
+               sys_handles[i] = f;
+               *handle = i;
+               retval = Sys_FileLength(f);
+       }
+
+       return retval;
+}
+
+int Sys_FileOpenWrite (const char *path)
+{
+       QFile   *f;
+       int             i;
+
+       i = findhandle ();
+
+       f = Qopen(path, "wb");
+       if (!f)
+       {
+               Con_Printf("Sys_FileOpenWrite: Error opening %s: %s", path, strerror(errno));
+               return 0;
+       }
+       sys_handles[i] = f;
+
+       return i;
+}
+
+void Sys_FileClose (int handle)
+{
+       Qclose (sys_handles[handle]);
+       sys_handles[handle] = NULL;
+}
+
+void Sys_FileSeek (int handle, int position)
+{
+       Qseek (sys_handles[handle], position, SEEK_SET);
+}
+
+int Sys_FileRead (int handle, void *dest, int count)
+{
+       return Qread (sys_handles[handle], dest, count);
+}
+
+int Sys_FileWrite (int handle, void *data, int count)
+{
+       return Qwrite (sys_handles[handle], data, count);
+}
+
+int Sys_FileTime (const char *path)
+{
+#if WIN32
+       QFile *f;
+
+       f = Qopen(path, "rb");
+       if (f)
+       {
+               Qclose(f);
+               return 1;
+       }
+
+       return -1;
+#else
+       struct stat buf;
+
+       if (stat (path,&buf) == -1)
+               return -1;
+
+       return buf.st_mtime;
+#endif
+}
+
+void Sys_mkdir (const char *path)
+{
+#if WIN32
+       _mkdir (path);
+#else
+       mkdir (path, 0777);
+#endif
+}
+
 char engineversion[128];
 
 void Sys_Shared_EarlyInit(void)
 {
+       Memory_Init ();
+
+       COM_InitArgv();
+       COM_InitGameType();
+
 #if defined(__linux__)
        sprintf (engineversion, "%s Linux %s", gamename, buildstring);
 #elif defined(WIN32)
@@ -117,7 +253,7 @@ void Sys_Shared_EarlyInit(void)
        if (COM_CheckParm("-nostdout"))
                sys_nostdout = 1;
        else
-               printf("%s\n", engineversion);
+               Con_Printf("%s\n", engineversion);
 }
 
 void Sys_Shared_LateInit(void)