X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.h;h=36544b4d8f8f521844d4016b4013bfe8af92bcc0;hb=6d06ba238902736bb99714dc8122bb32a286577a;hp=cc3ecf0a3349e03333c177504aaae465136e7d7b;hpb=3b0023fd3eacaecffa0ae6c9107c11d3abd4ac6c;p=rocksndiamonds.git

diff --git a/src/libgame/misc.h b/src/libgame/misc.h
index cc3ecf0a..36544b4d 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,14 +27,17 @@
 /* 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
-#define ERR_RETURN_LINE			(1 << 0)
+#define ERR_INFO			0
+#define ERR_INFO_LINE			(1 << 0)
 #define ERR_WARN			(1 << 1)
 #define ERR_EXIT			(1 << 2)
 #define ERR_HELP			(1 << 3)
@@ -74,6 +77,8 @@ char *int2str(int, int);
 char *i_to_a(unsigned int);
 int log_2(unsigned int);
 
+boolean getTokenValueFromString(char *, char **, char **);
+
 void InitCounter(void);
 unsigned long Counter(void);
 void Delay(unsigned long);
@@ -81,31 +86,30 @@ 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);
 
 char *getLoginName(void);
 char *getRealName(void);
-char *getHomeDir(void);
 
 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 *getStringCopyN(char *, int);
 char *getStringToLower(char *);
 void setString(char **, char *);
 boolean strEqual(char *, char *);
+boolean strEqualN(char *, char *, int);
+boolean strEqualPrefix(char *, char *);
+boolean strEqualSuffix(char *, char *);
 
 void GetOptions(char **, void (*print_usage_function)(void));
 
@@ -117,6 +121,7 @@ void *checked_malloc(unsigned long);
 void *checked_calloc(unsigned long);
 void *checked_realloc(void *, unsigned long);
 void checked_free(void *);
+void clear_mem(void *, unsigned long);
 
 void swap_numbers(int *, int *);
 void swap_number_pairs(int *, int *, int *, int *);
@@ -160,6 +165,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 *);
@@ -179,7 +185,9 @@ boolean FileIsArtworkType(char *, int);
 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 *,
@@ -189,8 +197,8 @@ void ReloadCustomArtworkList(struct ArtworkListInfo *);
 void FreeCustomArtworkLists(struct ArtworkListInfo *);
 
 char *getErrorFilename(char *);
-void initErrorFile();
-FILE *openErrorFile();
+void openErrorFile();
+void closeErrorFile();
 void dumpErrorFile();
 void NotifyUserAboutErrorFile();