X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.h;h=18565c7210fb57e142154c3cb60919d9184581b2;hb=3fb68b18f28034e492534fb3b5579fd1da888292;hp=7f8c2fd6bc868651ed3955a7c5e91983198e720a;hpb=28f0f8708f4b4f8c4f39f1b23bc5fc7e0fed7579;p=rocksndiamonds.git

diff --git a/src/libgame/misc.h b/src/libgame/misc.h
index 7f8c2fd6..18565c72 100644
--- a/src/libgame/misc.h
+++ b/src/libgame/misc.h
@@ -29,12 +29,13 @@
 
 /* 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 +54,31 @@
 #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);
+
 unsigned int SimpleRND(unsigned int);
 unsigned int RND(unsigned int);
 unsigned int InitRND(long);
+
 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 +89,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 +123,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 +132,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);
 
-/*
-void LoadArtworkConfig(struct ArtworkListInfo *);
-*/
-void ReloadCustomArtworkFiles(struct ArtworkListInfo *);
+int get_parameter_value(char *, char *, int);
 
+struct FileInfo *getFileListFromConfigList(struct ConfigInfo *,
+					   struct ConfigInfo *, char **, int);
+void LoadArtworkConfig(struct ArtworkListInfo *);
+void ReloadCustomArtworkList(struct ArtworkListInfo *);
+void FreeCustomArtworkLists(struct ArtworkListInfo *);
 
 #if !defined(PLATFORM_UNIX)
 void initErrorFile();