X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmisc.h;h=10aae9cec5e8975bf9a4d7beeacf825f1344835c;hb=c4b26cf489dcc65a00bfcc05f7898700d2f0c9e4;hp=5c23eb76427069cae31c5f19e175f8d2e095b911;hpb=8cef2a63b6c56ba086183693d3f73f02862cbd8f;p=rocksndiamonds.git

diff --git a/src/misc.h b/src/misc.h
index 5c23eb76..10aae9ce 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);
@@ -41,6 +44,10 @@ void MarkTileDirty(int, int);
 void GetOptions(char **);
 void Error(int, char *, ...);
 void *checked_malloc(unsigned long);
-char *getKeySymName(KeySym);
+char *getKeyNameFromKeySym(KeySym);
+char *getX11KeyNameFromKeySym(KeySym);
+KeySym getKeySymFromX11KeyName(char *);
+char *getJoyNameFromJoySymbol(int);
+int getJoySymbolFromJoyName(char *);
 
 #endif