corrected a few LittleLongs to LittleFloat in md3 loading (EEP those were bad)

[xonotic/darkplaces.git] / sys_shared.c

diff --git a/sys_shared.c b/sys_shared.c
index 0753133c0c6c0b3174f14093d7f312cf30f012c2..465b322ef71a5b9e82f0810967112051f27fb023 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -43,17 +43,14 @@ 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',  '{',  '|',  '}',  '~',  '<'
 };
 
-#ifdef WIN32
-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
@@ -64,16 +61,9 @@ void Sys_Printf (char *fmt, ...)
        struct tm       *local = NULL;
 
        unsigned char           *p;
-#ifdef WIN32
-       DWORD           dummy;
-#endif
 
        va_start (argptr, fmt);
-#ifdef HAVE_VSNPRINTF
        vsnprintf (start, sizeof(start), fmt, argptr);
-#else
-       vsprintf (start, fmt, argptr);
-#endif
        va_end (argptr);
 
        if (sys_nostdout)
@@ -94,33 +84,76 @@ void Sys_Printf (char *fmt, ...)
        final[MAX_PRINT_MSG - 1] = 0;
        for (p = (unsigned char *) final;*p; p++)
                *p = qfont_table[*p];
-#ifdef WIN32
-       if (cls.state == ca_dedicated)
-               WriteFile(houtput, final, strlen (final), &dummy, NULL);
-#else
-       printf("%s", final);
-#endif
+       Sys_Print(final);
 }
 
+
 char engineversion[128];
 
 void Sys_Shared_EarlyInit(void)
 {
+       const char* os;
+
+       Memory_Init ();
+
+       COM_InitArgv();
+       COM_InitGameType();
+
 #if defined(__linux__)
-       sprintf (engineversion, "%s Linux %s", gamename, buildstring);
+       os = "Linux";
 #elif defined(WIN32)
-       sprintf (engineversion, "%s Windows %s", gamename, buildstring);
+       os = "Windows";
 #else
-       sprintf (engineversion, "%s Unknown %s", gamename, buildstring);
+       os = "Unknown";
 #endif
+       snprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring);
 
        if (COM_CheckParm("-nostdout"))
                sys_nostdout = 1;
        else
-               printf("%s\n", engineversion);
+               Con_Printf("%s\n", engineversion);
 }
 
 void Sys_Shared_LateInit(void)
 {
 }
 
+/*
+===============================================================================
+
+DLL MANAGEMENT
+
+===============================================================================
+*/
+
+#ifndef WIN32
+#include <dlfcn.h>
+#endif
+
+dllhandle_t Sys_LoadLibrary (const char* name)
+{
+#ifdef WIN32
+       return LoadLibrary (name);
+#else
+       return dlopen (name, RTLD_LAZY);
+#endif
+}
+
+void Sys_UnloadLibrary (dllhandle_t handle)
+{
+#ifdef WIN32
+       FreeLibrary (handle);
+#else
+       dlclose (handle);
+#endif
+}
+
+void* Sys_GetProcAddress (dllhandle_t handle, const char* name)
+{
+#ifdef WIN32
+       return (void *)GetProcAddress (handle, name);
+#else
+       return (void *)dlsym (handle, name);
+#endif
+}
+