X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.h;h=009350c025afb7eb9c1823f29bf8c0759a110c7e;hb=ac86d841daa4ecafff3128110a1db109e03fb355;hp=7b36d47ac54d120c5a3db4c805233e8708fbd0d9;hpb=95ff39b11bc3c268d8206193bad1433ac9526c94;p=rocksndiamonds.git

diff --git a/src/libgame/misc.h b/src/libgame/misc.h
index 7b36d47a..009350c0 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,22 +84,15 @@ 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 *getPath2(char *, char *);
 char *getPath3(char *, char *, char*);
@@ -117,8 +113,8 @@ void *checked_calloc(unsigned long);
 void *checked_realloc(void *, unsigned long);
 void checked_free(void *);
 
-inline void swap_numbers(int *, int *);
-inline void swap_number_pairs(int *, int *, int *, int *);
+void swap_numbers(int *, int *);
+void swap_number_pairs(int *, int *, int *, int *);
 
 int getFile8BitInteger(FILE *);
 int putFile8BitInteger(FILE *, int);
@@ -128,9 +124,9 @@ int getFile32BitInteger(FILE *, int);
 int putFile32BitInteger(FILE *, int, int);
 
 boolean getFileChunk(FILE *, char *, int *, int);
-void putFileChunk(FILE *, char *, int, int);
+int putFileChunk(FILE *, char *, int, int);
 int getFileVersion(FILE *);
-void putFileVersion(FILE *, int);
+int putFileVersion(FILE *, int);
 
 void ReadBytesFromFile(FILE *, byte *, unsigned long);
 void WriteBytesToFile(FILE *, byte *, unsigned long);
@@ -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);
@@ -187,11 +186,11 @@ void LoadArtworkConfig(struct ArtworkListInfo *);
 void ReloadCustomArtworkList(struct ArtworkListInfo *);
 void FreeCustomArtworkLists(struct ArtworkListInfo *);
 
-#if !defined(PLATFORM_UNIX)
-void initErrorFile();
-FILE *openErrorFile();
+char *getErrorFilename(char *);
+void openErrorFile();
+void closeErrorFile();
 void dumpErrorFile();
-#endif
+void NotifyUserAboutErrorFile();
 
 void debug_print_timestamp(int, char *);