projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into releases
[rocksndiamonds.git]
/
src
/
misc.h
diff --git
a/src/misc.h
b/src/misc.h
index 10aae9cec5e8975bf9a4d7beeacf825f1344835c..ae8ae79e9ad85e266d8778c503a43e25d735d5d7 100644
(file)
--- a/
src/misc.h
+++ b/
src/misc.h
@@
-25,9
+25,14
@@
#define ERR_WARN (1 << 0)
#define ERR_EXIT (1 << 1)
#define ERR_HELP (1 << 2)
#define ERR_WARN (1 << 0)
#define ERR_EXIT (1 << 1)
#define ERR_HELP (1 << 2)
-#define ERR_SOUNDSERVER (1 << 3)
+#define ERR_SOUND_SERVER (1 << 3)
+#define ERR_NETWORK_SERVER (1 << 4)
+#define ERR_NETWORK_CLIENT (1 << 5)
+#define ERR_FROM_SERVER (ERR_SOUND_SERVER | ERR_NETWORK_SERVER)
#define ERR_EXIT_HELP (ERR_EXIT | ERR_HELP)
#define ERR_EXIT_HELP (ERR_EXIT | ERR_HELP)
-#define ERR_EXIT_SOUNDSERVER (ERR_EXIT | ERR_SOUNDSERVER)
+#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)
void InitCounter(void);
unsigned long Counter(void);
void InitCounter(void);
unsigned long Counter(void);
@@
-39,15
+44,25
@@
char *int2str(int, int);
unsigned int SimpleRND(unsigned int);
unsigned int RND(unsigned int);
unsigned int InitRND(long);
unsigned int SimpleRND(unsigned int);
unsigned int RND(unsigned int);
unsigned int InitRND(long);
-char *GetLoginName(void);
+char *getLoginName(void);
+char *getHomeDir(void);
+char *getPath2(char *, char *);
+char *getPath3(char *, char *, char*);
+char *getStringCopy(char *);
+char *getStringToLower(char *);
void MarkTileDirty(int, int);
void GetOptions(char **);
void Error(int, char *, ...);
void *checked_malloc(unsigned long);
void MarkTileDirty(int, int);
void GetOptions(char **);
void Error(int, char *, ...);
void *checked_malloc(unsigned long);
+void *checked_calloc(unsigned long);
char *getKeyNameFromKeySym(KeySym);
char *getX11KeyNameFromKeySym(KeySym);
KeySym getKeySymFromX11KeyName(char *);
char *getJoyNameFromJoySymbol(int);
int getJoySymbolFromJoyName(char *);
char *getKeyNameFromKeySym(KeySym);
char *getX11KeyNameFromKeySym(KeySym);
KeySym getKeySymFromX11KeyName(char *);
char *getJoyNameFromJoySymbol(int);
int getJoySymbolFromJoyName(char *);
+int getJoystickNrFromDeviceName(char *);
-#endif
+void debug_print_timestamp(int, char *);
+void print_debug(char *);
+
+#endif /* MISC_H */