X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmisc.h;h=c01091757486e956a3b456b10635d2ba85b06e68;hb=ab0879a8bcb3e816912bc89b8e21c22cc2a4c0c2;hp=5c23eb76427069cae31c5f19e175f8d2e095b911;hpb=8cef2a63b6c56ba086183693d3f73f02862cbd8f;p=rocksndiamonds.git diff --git a/src/misc.h b/src/misc.h index 5c23eb76..c0109175 100644 --- a/src/misc.h +++ b/src/misc.h @@ -22,9 +22,12 @@ #define NEW_RANDOMIZE -1 #define ERR_RETURN 0 -#define ERR_EXIT 1 -#define ERR_EXIT_HELP 2 -#define ERR_EXIT_SOUNDSERVER 3 +#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); @@ -36,11 +39,17 @@ char *int2str(int, int); unsigned int SimpleRND(unsigned int); unsigned int RND(unsigned int); unsigned int InitRND(long); -char *GetLoginName(void); +char *getLoginName(void); +char *getHomeDir(void); void MarkTileDirty(int, int); void GetOptions(char **); void Error(int, char *, ...); void *checked_malloc(unsigned long); -char *getKeySymName(KeySym); +void *checked_calloc(unsigned long); +char *getKeyNameFromKeySym(KeySym); +char *getX11KeyNameFromKeySym(KeySym); +KeySym getKeySymFromX11KeyName(char *); +char *getJoyNameFromJoySymbol(int); +int getJoySymbolFromJoyName(char *); #endif