X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.h;h=6b05533ad7a30e80b94ef4fa2bb1488c70a0f6c2;hb=6435b79b71c4033de78ab3e611ee63f6a2147874;hp=429a7bac4050025d9924bdb1f99028ae001be3c7;hpb=fa2a77aa4b53bb786e67f35d6c46f759ebe7823d;p=rocksndiamonds.git

diff --git a/src/libgame/misc.h b/src/libgame/misc.h
index 429a7bac..6b05533a 100644
--- a/src/libgame/misc.h
+++ b/src/libgame/misc.h
@@ -27,14 +27,20 @@
 /* values for InitRND() */
 #define NEW_RANDOMIZE			-1
 
+#define InitRND(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)
+
 /* values for Error() */
 #define ERR_RETURN			0
-#define ERR_WARN			(1 << 0)
-#define ERR_EXIT			(1 << 1)
-#define ERR_HELP			(1 << 2)
-#define ERR_SOUND_SERVER		(1 << 3)
-#define ERR_NETWORK_SERVER		(1 << 4)
-#define ERR_NETWORK_CLIENT		(1 << 5)
+#define ERR_RETURN_LINE			(1 << 0)
+#define ERR_WARN			(1 << 1)
+#define ERR_EXIT			(1 << 2)
+#define ERR_HELP			(1 << 3)
+#define ERR_SOUND_SERVER		(1 << 4)
+#define ERR_NETWORK_SERVER		(1 << 5)
+#define ERR_NETWORK_CLIENT		(1 << 6)
 #define ERR_FROM_SERVER			(ERR_SOUND_SERVER | ERR_NETWORK_SERVER)
 #define ERR_EXIT_HELP			(ERR_EXIT | ERR_HELP)
 #define ERR_EXIT_SOUND_SERVER		(ERR_EXIT | ERR_SOUND_SERVER)
@@ -53,23 +59,37 @@
 #define MAX_FILENAME_LEN		256
 #define MAX_LINE_LEN			1000
 
+void fprintf_line(FILE *, char *, int);
+void printf_line(char *, int);
+char *int2str(int, int);
+
 void InitCounter(void);
 unsigned long Counter(void);
 void Delay(unsigned long);
 boolean FrameReached(unsigned long *, unsigned long);
 boolean DelayReached(unsigned long *, unsigned long);
 void WaitUntilDelayReached(unsigned long *, unsigned long);
-char *int2str(int, int);
+
+#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, unsigned int);
+
 char *getLoginName(void);
 char *getRealName(void);
 char *getHomeDir(void);
+
 char *getPath2(char *, char *);
 char *getPath3(char *, char *, char*);
+char *getStringCat2(char *, char *);
 char *getStringCopy(char *);
 char *getStringToLower(char *);
+void setString(char **, char *);
 
 void GetOptions(char **);
 
@@ -80,6 +100,7 @@ void Error(int, char *, ...);
 void *checked_malloc(unsigned long);
 void *checked_calloc(unsigned long);
 void *checked_realloc(void *, unsigned long);
+
 inline void swap_numbers(int *, int *);
 inline void swap_number_pairs(int *, int *, int *, int *);
 
@@ -113,6 +134,8 @@ Key getKeyFromKeyName(char *);
 Key getKeyFromX11KeyName(char *);
 char getCharFromKey(Key);
 
+int get_integer_from_string(char *);
+boolean get_boolean_from_string(char *);
 
 ListNode *newListNode(void);
 void addNodeToList(ListNode **, char *, void *);
@@ -120,17 +143,18 @@ void deleteNodeFromList(ListNode **, char *, void (*function)(void *));
 ListNode *getNodeFromKey(ListNode *, char *);
 int getNumNodes(ListNode *);
 
-
 boolean FileIsGraphic(char *);
 boolean FileIsSound(char *);
 boolean FileIsMusic(char *);
 boolean FileIsArtworkType(char *, int);
 
+int get_parameter_value(char *, char *, int);
+
 struct FileInfo *getFileListFromConfigList(struct ConfigInfo *,
-					   struct ConfigInfo *, int);
+					   struct ConfigInfo *, char **, int);
+void LoadArtworkConfig(struct ArtworkListInfo *);
 void ReloadCustomArtworkList(struct ArtworkListInfo *);
-void FreeCustomArtworkList(struct ArtworkListInfo *);
-
+void FreeCustomArtworkLists(struct ArtworkListInfo *);
 
 #if !defined(PLATFORM_UNIX)
 void initErrorFile();
@@ -138,8 +162,6 @@ FILE *openErrorFile();
 void dumpErrorFile();
 #endif
 
-void printf_line(char, int);
-
 void debug_print_timestamp(int, char *);
 
 #endif /* MISC_H */