X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.h;h=5d6084f13e04b33f1792ad23700e21cdb4927e48;hb=466240bdd432835656962afbc3ab9ed9f9d5797a;hp=ba82dad42a4a495530cdba153eb7872085ea5522;hpb=7719feee76dac64d8f6153d4c379c44db1d89f7d;p=rocksndiamonds.git diff --git a/src/libgame/misc.h b/src/libgame/misc.h index ba82dad4..5d6084f1 100644 --- a/src/libgame/misc.h +++ b/src/libgame/misc.h @@ -34,23 +34,6 @@ #define GetEngineRandom(max) get_random_number(RANDOM_ENGINE, max) #define GetSimpleRandom(max) get_random_number(RANDOM_SIMPLE, max) -// values for Error() -#define ERR_UNKNOWN 0 -#define ERR_DEBUG (1 << 0) -#define ERR_INFO (1 << 1) -#define ERR_INFO_LINE (1 << 2) -#define ERR_WARN (1 << 3) -#define ERR_EXIT (1 << 4) -#define ERR_HELP (1 << 5) -#define ERR_SOUND_SERVER (1 << 6) -#define ERR_NETWORK_SERVER (1 << 7) -#define ERR_NETWORK_CLIENT (1 << 8) -#define ERR_FROM_SERVER (ERR_SOUND_SERVER | ERR_NETWORK_SERVER) -#define ERR_EXIT_HELP (ERR_EXIT | ERR_HELP) -#define ERR_EXIT_SOUND_SERVER (ERR_EXIT | ERR_SOUND_SERVER) -#define ERR_EXIT_NETWORK_SERVER (ERR_EXIT | ERR_NETWORK_SERVER) -#define ERR_EXIT_NETWORK_CLIENT (ERR_EXIT | ERR_NETWORK_CLIENT) - // values for getFile...() and putFile...() #define BYTE_ORDER_BIG_ENDIAN 0 #define BYTE_ORDER_LITTLE_ENDIAN 1 @@ -123,9 +106,13 @@ void PrintNoLog(char *, ...); void PrintLine(char *, int); void PrintLineWithPrefix(char *, char *, int); +void DebugContinued(char *, char *, ...); void Debug(char *, char *, ...); void Info(char *, ...); void Warn(char *, ...); +void Error(char *, ...); +void Fail(char *, ...); +void FailWithHelp(char *, ...); char *int2str(int, int); char *i_to_a(unsigned int); @@ -148,6 +135,12 @@ void SkipUntilDelayReached(unsigned int *, unsigned int, int *, int); unsigned int init_random_number(int, int); unsigned int get_random_number(int, int); +#if defined(PLATFORM_UNIX) +char *getUnixLoginName(void); +char *getUnixRealName(void); +char *getUnixHomeDir(void); +#endif + char *getLoginName(void); char *getRealName(void); @@ -182,10 +175,6 @@ void GetOptions(int, char **, void (*print_usage_function)(void), void (*print_version_function)(void)); -void SetError(char *, ...); -char *GetError(void); -void Error(int, char *, ...); - void *checked_malloc(unsigned int); void *checked_calloc(unsigned int); void *checked_realloc(void *, unsigned int);