X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.h;h=9a5e9186c47ed03dfc40d2242f09badfa3bc4d70;hb=9cb181e05e485435ef48586dd4f2811ba1e672b3;hp=4319ceede53c70c4820ba9d4365ff407fd6932d8;hpb=22f539028eb272b70d339e1f37552a2a89f37dd6;p=rocksndiamonds.git

diff --git a/src/libgame/misc.h b/src/libgame/misc.h
index 4319ceed..9a5e9186 100644
--- a/src/libgame/misc.h
+++ b/src/libgame/misc.h
@@ -1,7 +1,7 @@
 /***********************************************************
 * Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-* (c) 1994-2002 Artsoft Entertainment                      *
+* (c) 1994-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -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
@@ -81,13 +84,6 @@ boolean FrameReached(unsigned long *, unsigned long);
 boolean DelayReached(unsigned long *, unsigned long);
 void WaitUntilDelayReached(unsigned long *, unsigned long);
 
-#if 0
-unsigned int SimpleRND(unsigned int);
-unsigned int InitSimpleRND(long);
-unsigned int RND(unsigned int);
-unsigned int InitRND(long);
-#endif
-
 unsigned int init_random_number(int, long);
 unsigned int get_random_number(int, int);
 
@@ -98,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 *);
@@ -159,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 *);