rnd-20070131-1-src

[rocksndiamonds.git] / src / libgame / misc.h

diff --git a/src/libgame/misc.h b/src/libgame/misc.h
index 1bafb463efe04bdd3a3661b7067075996b862079..9a5e9186c47ed03dfc40d2242f09badfa3bc4d70 100644 (file)
--- a/src/libgame/misc.h
+++ b/src/libgame/misc.h
@@ -27,10 +27,13 @@
 /* values for InitRND() */
 #define NEW_RANDOMIZE                  -1
 
-#define InitEngineRND(seed)            init_random_number(0, seed)
-#define InitSimpleRND(seed)            init_random_number(1, seed)
-#define RND(max)                       get_random_number(0, max)
-#define SimpleRND(max)                 get_random_number(1, max)
+#define RANDOM_ENGINE                  0
+#define RANDOM_SIMPLE                  1
+
+#define InitEngineRandom(seed)         init_random_number(RANDOM_ENGINE, seed)
+#define InitSimpleRandom(seed)         init_random_number(RANDOM_SIMPLE, seed)
+#define GetEngineRandom(max)           get_random_number(RANDOM_ENGINE, max)
+#define GetSimpleRandom(max)           get_random_number(RANDOM_SIMPLE, max)
 
 /* values for Error() */
 #define ERR_RETURN                     0
@@ -91,9 +94,12 @@ char *getBasePath(char *);
 char *getBaseName(char *);
 char *getBaseNamePtr(char *);
 
+char *getStringCat2WithSeparator(char *, char *, char *);
+char *getStringCat3WithSeparator(char *, char *, char *, char *);
+char *getStringCat2(char *, char *);
+char *getStringCat3(char *, char *, char *);
 char *getPath2(char *, char *);
 char *getPath3(char *, char *, char*);
-char *getStringCat2(char *, char *);
 char *getStringCopy(char *);
 char *getStringToLower(char *);
 void setString(char **, char *);
@@ -152,6 +158,7 @@ char *getX11KeyNameFromKey(Key);
 Key getKeyFromKeyName(char *);
 Key getKeyFromX11KeyName(char *);
 char getCharFromKey(Key);
+char getValidConfigValueChar(char);
 
 int get_integer_from_string(char *);
 boolean get_boolean_from_string(char *);