X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.h;h=a410a11174eeb7e2b7b215b27180bc18a2f1a7df;hb=8cea50fbd1b74a2bc164a79cbd26bdbb3abd6689;hp=2a727278931a41c64f3853a84c83812d8c960922;hpb=ea933dd51bfca7ddcc6b75465476cce57afd1682;p=rocksndiamonds.git

diff --git a/src/libgame/misc.h b/src/libgame/misc.h
index 2a727278..a410a111 100644
--- a/src/libgame/misc.h
+++ b/src/libgame/misc.h
@@ -27,7 +27,7 @@
 /* values for InitRND() */
 #define NEW_RANDOMIZE			-1
 
-#define InitRND(seed)			init_random_number(0, seed)
+#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)
@@ -51,6 +51,10 @@
 #define BYTE_ORDER_BIG_ENDIAN		0
 #define BYTE_ORDER_LITTLE_ENDIAN	1
 
+/* values for cursor bitmap creation */
+#define BIT_ORDER_MSB			0
+#define BIT_ORDER_LSB			1
+
 /* values for createDirectory() */
 #define PERMS_PRIVATE			0
 #define PERMS_PUBLIC			1
@@ -65,7 +69,10 @@
 
 void fprintf_line(FILE *, char *, int);
 void printf_line(char *, int);
+void printf_line_with_prefix(char *, char *, int);
 char *int2str(int, int);
+char *i_to_a(unsigned int);
+int log_2(unsigned int);
 
 void InitCounter(void);
 unsigned long Counter(void);
@@ -82,11 +89,14 @@ unsigned int InitRND(long);
 #endif
 
 unsigned int init_random_number(int, long);
-unsigned int get_random_number(int, unsigned int);
+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*);
@@ -94,8 +104,9 @@ char *getStringCat2(char *, char *);
 char *getStringCopy(char *);
 char *getStringToLower(char *);
 void setString(char **, char *);
+boolean strEqual(char *, char *);
 
-void GetOptions(char **);
+void GetOptions(char **, void (*print_usage_function)(void));
 
 void SetError(char *, ...);
 char *GetError(void);
@@ -104,21 +115,31 @@ void Error(int, char *, ...);
 void *checked_malloc(unsigned long);
 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 *);
 
-short getFile16BitInteger(FILE *, int);
-void putFile16BitInteger(FILE *, short, int);
+int getFile8BitInteger(FILE *);
+int putFile8BitInteger(FILE *, int);
+int getFile16BitInteger(FILE *, int);
+int putFile16BitInteger(FILE *, int, int);
 int getFile32BitInteger(FILE *, int);
-void putFile32BitInteger(FILE *, int, 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);
+
 void ReadUnusedBytesFromFile(FILE *, unsigned long);
 void WriteUnusedBytesToFile(FILE *, unsigned long);
 
+#define getFile8Bit(f)        getFile8BitInteger(f)
+#define putFile8Bit(f,x)      putFile8BitInteger(f,x)
 #define getFile16BitBE(f)     getFile16BitInteger(f,BYTE_ORDER_BIG_ENDIAN)
 #define getFile16BitLE(f)     getFile16BitInteger(f,BYTE_ORDER_LITTLE_ENDIAN)
 #define putFile16BitBE(f,x)   putFile16BitInteger(f,x,BYTE_ORDER_BIG_ENDIAN)
@@ -127,6 +148,7 @@ void WriteUnusedBytesToFile(FILE *, unsigned long);
 #define getFile32BitLE(f)     getFile32BitInteger(f,BYTE_ORDER_LITTLE_ENDIAN)
 #define putFile32BitBE(f,x)   putFile32BitInteger(f,x,BYTE_ORDER_BIG_ENDIAN)
 #define putFile32BitLE(f,x)   putFile32BitInteger(f,x,BYTE_ORDER_LITTLE_ENDIAN)
+
 #define getFileChunkBE(f,s,x) getFileChunk(f,s,x,BYTE_ORDER_BIG_ENDIAN)
 #define getFileChunkLE(f,s,x) getFileChunk(f,s,x,BYTE_ORDER_LITTLE_ENDIAN)
 #define putFileChunkBE(f,s,x) putFileChunk(f,s,x,BYTE_ORDER_BIG_ENDIAN)
@@ -147,24 +169,31 @@ void deleteNodeFromList(ListNode **, char *, void (*function)(void *));
 ListNode *getNodeFromKey(ListNode *, char *);
 int getNumNodes(ListNode *);
 
+boolean fileExists(char *);
 boolean FileIsGraphic(char *);
 boolean FileIsSound(char *);
 boolean FileIsMusic(char *);
 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 *);
 
 struct FileInfo *getFileListFromConfigList(struct ConfigInfo *,
-					   struct ConfigInfo *, char **, int);
+					   struct ConfigTypeInfo *,
+					   char **, int);
 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 *);