X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmisc.h;h=10aae9cec5e8975bf9a4d7beeacf825f1344835c;hb=c4b26cf489dcc65a00bfcc05f7898700d2f0c9e4;hp=8b483c520871c4a239a8409858c00588a1526fec;hpb=e557b2b5d9951a4e692fd4e32a5cf45c84252c64;p=rocksndiamonds.git diff --git a/src/misc.h b/src/misc.h index 8b483c52..10aae9ce 100644 --- a/src/misc.h +++ b/src/misc.h @@ -22,14 +22,18 @@ #define NEW_RANDOMIZE -1 #define ERR_RETURN 0 -#define ERR_EXIT 1 -#define ERR_EXITHELP 2 +#define ERR_WARN (1 << 0) +#define ERR_EXIT (1 << 1) +#define ERR_HELP (1 << 2) +#define ERR_SOUNDSERVER (1 << 3) +#define ERR_EXIT_HELP (ERR_EXIT | ERR_HELP) +#define ERR_EXIT_SOUNDSERVER (ERR_EXIT | ERR_SOUNDSERVER) void InitCounter(void); unsigned long Counter(void); void Delay(unsigned long); -BOOL FrameReached(unsigned long *, unsigned long); -BOOL DelayReached(unsigned long *, unsigned long); +boolean FrameReached(unsigned long *, unsigned long); +boolean DelayReached(unsigned long *, unsigned long); void WaitUntilDelayReached(unsigned long *, unsigned long); char *int2str(int, int); unsigned int SimpleRND(unsigned int); @@ -39,5 +43,11 @@ char *GetLoginName(void); void MarkTileDirty(int, int); void GetOptions(char **); void Error(int, char *, ...); +void *checked_malloc(unsigned long); +char *getKeyNameFromKeySym(KeySym); +char *getX11KeyNameFromKeySym(KeySym); +KeySym getKeySymFromX11KeyName(char *); +char *getJoyNameFromJoySymbol(int); +int getJoySymbolFromJoyName(char *); #endif