rnd-20060828-1-src

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

diff --git a/src/libgame/misc.h b/src/libgame/misc.h
index 7c84c94b21e1c2480528580c9458fc183638f3b0..009350c025afb7eb9c1823f29bf8c0759a110c7e 100644 (file)
--- 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);
 
@@ -180,6 +176,9 @@ char *get_mapped_token(char *);
 int get_parameter_value(char *, char *, int);
 int get_auto_parameter_value(char *, char *);
 
+struct ScreenModeInfo *get_screen_mode_from_string(char *);
+void get_aspect_ratio_from_screen_mode(struct ScreenModeInfo *, int *x, int *y);
+
 struct FileInfo *getFileListFromConfigList(struct ConfigInfo *,
                                           struct ConfigTypeInfo *,
                                           char **, int);