projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981026-1
[rocksndiamonds.git]
/
src
/
misc.h
diff --git
a/src/misc.h
b/src/misc.h
index 5c23eb76427069cae31c5f19e175f8d2e095b911..10aae9cec5e8975bf9a4d7beeacf825f1344835c 100644
(file)
--- a/
src/misc.h
+++ b/
src/misc.h
@@
-22,9
+22,12
@@
#define NEW_RANDOMIZE -1
#define ERR_RETURN 0
#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);
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);
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
#endif