X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=5096f2b7d0c504eea9cc07de0ffbcf0897ba17fd;hb=f60e97c16b1c14ffd21d9f9ca86ad0be52dfa9b4;hp=44dd664f871ccb53128f9c9456e0f942d8361ad1;hpb=bcb3453f710b95ec98b188b95574bea9ab336e96;p=rocksndiamonds.git

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 44dd664f..5096f2b7 100644
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -46,7 +46,8 @@
 					 TYPE_STRING)
 
 #define TYPE_SKIP_ENTRY			(TYPE_EMPTY | \
-					 TYPE_KEY)
+					 TYPE_KEY | \
+					 TYPE_STRING)
 
 #define TYPE_ENTER_OR_LEAVE_MENU	(TYPE_ENTER_MENU | \
 					 TYPE_LEAVE_MENU)
@@ -140,25 +141,25 @@ char *getScoreFilename(int);
 char *getSetupFilename(void);
 char *getImageFilename(char *);
 char *getCustomImageFilename(char *);
+char *getCustomSoundFilename(char *);
+char *getCustomSoundConfigFilename(void);
+char *getCustomMusicDirectory(void);
 
 void InitTapeDirectory(char *);
 void InitScoreDirectory(char *);
 void InitUserLevelDirectory(char *);
 void InitLevelSetupDirectory(char *);
 
-void ReadChunk_VERS(FILE *, int *, int *);
-void WriteChunk_VERS(FILE *, int, int);
-
 TreeInfo *newTreeInfo();
 void pushTreeInfo(TreeInfo **, TreeInfo *);
 int numTreeInfo(TreeInfo *);
 boolean validLevelSeries(TreeInfo *);
-TreeInfo *getFirstValidLevelSeries(TreeInfo *);
+TreeInfo *getFirstValidTreeInfoEntry(TreeInfo *);
 TreeInfo *getTreeInfoFirstGroupEntry(TreeInfo *);
 int numTreeInfoInGroup(TreeInfo *);
 int posTreeInfo(TreeInfo *);
 TreeInfo *getTreeInfoFromPos(TreeInfo *, int);
-TreeInfo *getTreeInfoFromFilename(char *);
+TreeInfo *getTreeInfoFromFilename(TreeInfo *, char *);
 void dumpTreeInfo(TreeInfo *, int);
 void sortTreeInfo(TreeInfo **,
 		  int (*compare_function)(const void *, const void *));
@@ -184,6 +185,8 @@ char *getSetupLine(struct TokenInfo *, char *, int);
 
 void LoadLevelInfo(void);
 void LoadArtworkInfo(void);
+void LoadLevelArtworkInfo(void);
+
 void LoadLevelSetup_LastSeries(void);
 void SaveLevelSetup_LastSeries(void);
 void LoadLevelSetup_SeriesInfo(void);