X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.h;h=32dc36c26abc90313ce3d4ba62192aff95cade32;hb=de49192b75b9ff43a8c2ed6cb200efb4240d8d6d;hp=672bf635dbe6bd14806ead53ccb71ccc81e87c07;hpb=34dc736661e297f75d604335a7d85ea34d14c55d;p=rocksndiamonds.git diff --git a/src/libgame/misc.h b/src/libgame/misc.h index 672bf635..32dc36c2 100644 --- a/src/libgame/misc.h +++ b/src/libgame/misc.h @@ -4,7 +4,7 @@ // (c) 1995-2014 by Artsoft Entertainment // Holger Schemel // info@artsoft.org -// http://www.artsoft.org/ +// https://www.artsoft.org/ // ---------------------------------------------------------------------------- // 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,6 +106,13 @@ void PrintNoLog(char *, ...); void PrintLine(char *, int); void PrintLineWithPrefix(char *, char *, int); +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); int log_2(unsigned int); @@ -180,7 +170,6 @@ void GetOptions(int, char **, void SetError(char *, ...); char *GetError(void); -void Error(int, char *, ...); void *checked_malloc(unsigned int); void *checked_calloc(unsigned int);