X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sys_shared.c;h=9b4aea623989069b6ad652e912625c7ef3609052;hb=336f89e49a7ad642ce57e6c35c5241239d77dcca;hp=881c560e9fdb7829156d1630f2d96625c7ae7f2d;hpb=e526d9653bdf0d6783d4383ec0c3528fd4a487b2;p=xonotic%2Fdarkplaces.git diff --git a/sys_shared.c b/sys_shared.c index 881c560e..9b4aea62 100644 --- a/sys_shared.c +++ b/sys_shared.c @@ -1,93 +1,31 @@ #include "quakedef.h" -#include +# include #ifndef WIN32 -#include -#include +# include +# include +# include #endif -extern cvar_t timestamps; -extern cvar_t timeformat; - -static int sys_nostdout = false; - -/* The translation table between the graphical font and plain ASCII --KB */ -static char qfont_table[256] = { - '\0', '#', '#', '#', '#', '.', '#', '#', - '#', 9, 10, '#', ' ', 13, '.', '.', - '[', ']', '0', '1', '2', '3', '4', '5', - '6', '7', '8', '9', '.', '<', '=', '>', - ' ', '!', '"', '#', '$', '%', '&', '\'', - '(', ')', '*', '+', ',', '-', '.', '/', - '0', '1', '2', '3', '4', '5', '6', '7', - '8', '9', ':', ';', '<', '=', '>', '?', - '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', - 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', - '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', - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', - 'x', 'y', 'z', '{', '|', '}', '~', '<', - - '<', '=', '>', '#', '#', '.', '#', '#', - '#', '#', ' ', '#', ' ', '>', '.', '.', - '[', ']', '0', '1', '2', '3', '4', '5', - '6', '7', '8', '9', '.', '<', '=', '>', - ' ', '!', '"', '#', '$', '%', '&', '\'', - '(', ')', '*', '+', ',', '-', '.', '/', - '0', '1', '2', '3', '4', '5', '6', '7', - '8', '9', ':', ';', '<', '=', '>', '?', - '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', - 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', - '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', - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', - 'x', 'y', 'z', '{', '|', '}', '~', '<' -}; - - -#define MAX_PRINT_MSG 16384 -void Sys_Printf (const char *fmt, ...) -{ - va_list argptr; - char start[MAX_PRINT_MSG]; // String we started with - char stamp[MAX_PRINT_MSG]; // Time stamp - char final[MAX_PRINT_MSG]; // String we print - - time_t mytime = 0; - struct tm *local = NULL; - - unsigned char *p; - - va_start (argptr, fmt); - vsnprintf (start, sizeof(start), fmt, argptr); - va_end (argptr); +qboolean sys_nostdout = false; - if (sys_nostdout) - return; - - if (timestamps.integer) - { - mytime = time (NULL); - local = localtime (&mytime); - strftime (stamp, sizeof (stamp), timeformat.string, local); +static char sys_timestring[128]; +char *Sys_TimeString(const char *timeformat) +{ + time_t mytime = time(NULL); + strftime(sys_timestring, sizeof(sys_timestring), timeformat, localtime(&mytime)); + return sys_timestring; +} - snprintf (final, sizeof (final), "%s%s", stamp, start); - } - else - snprintf (final, sizeof (final), "%s", start); - // LordHavoc: make sure the string is terminated - final[MAX_PRINT_MSG - 1] = 0; - for (p = (unsigned char *) final;*p; p++) - *p = qfont_table[*p]; - Sys_Print(final); +extern qboolean host_shuttingdown; +void Sys_Quit (void) +{ + host_shuttingdown = true; + Host_Shutdown(); + exit(0); } - char engineversion[128]; void Sys_Shared_EarlyInit(void) @@ -95,6 +33,7 @@ void Sys_Shared_EarlyInit(void) const char* os; Memory_Init (); + Log_Init (); COM_InitArgv(); COM_InitGameType(); @@ -103,15 +42,20 @@ void Sys_Shared_EarlyInit(void) os = "Linux"; #elif defined(WIN32) os = "Windows"; +#elif defined(__FreeBSD__) + os = "FreeBSD"; #elif defined(__NetBSD__) os = "NetBSD"; #elif defined(__OpenBSD__) os = "OpenBSD"; +#elif defined(MACOSX) + os = "Mac OS X"; #else os = "Unknown"; #endif - snprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring); + dpsnprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring); +// COMMANDLINEOPTION: Console: -nostdout disables text output to the terminal the game was launched from if (COM_CheckParm("-nostdout")) sys_nostdout = 1; else @@ -130,26 +74,64 @@ DLL MANAGEMENT =============================================================================== */ -#ifndef WIN32 -#include -#endif - -dllhandle_t Sys_LoadLibrary (const char* name) +qboolean Sys_LoadLibrary (const char** dllnames, dllhandle_t* handle, const dllfunction_t *fcts) { + const dllfunction_t *func; + dllhandle_t dllhandle = 0; + unsigned int i; + + if (handle == NULL) + return false; + + // Initializations + for (func = fcts; func && func->name != NULL; func++) + *func->funcvariable = NULL; + + // Try every possible name + for (i = 0; dllnames[i] != NULL; i++) + { #ifdef WIN32 - return LoadLibrary (name); + dllhandle = LoadLibrary (dllnames[i]); #else - return dlopen (name, RTLD_LAZY); + dllhandle = dlopen (dllnames[i], RTLD_LAZY); #endif + if (dllhandle) + break; + + Con_Printf ("Can't load \"%s\".\n", dllnames[i]); + } + + // No DLL found + if (! dllhandle) + return false; + + Con_Printf("\"%s\" loaded.\n", dllnames[i]); + + // Get the function adresses + for (func = fcts; func && func->name != NULL; func++) + if (!(*func->funcvariable = (void *) Sys_GetProcAddress (dllhandle, func->name))) + { + Con_Printf ("Missing function \"%s\" - broken library!\n", func->name); + Sys_UnloadLibrary (&dllhandle); + return false; + } + + *handle = dllhandle; + return true; } -void Sys_UnloadLibrary (dllhandle_t handle) +void Sys_UnloadLibrary (dllhandle_t* handle) { + if (handle == NULL || *handle == NULL) + return; + #ifdef WIN32 - FreeLibrary (handle); + FreeLibrary (*handle); #else - dlclose (handle); + dlclose (*handle); #endif + + *handle = NULL; } void* Sys_GetProcAddress (dllhandle_t handle, const char* name)