X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=2252aa6bdc6dc955cb368a2962f5b5c02f20d4fe;hb=696d50b659131ba46ea7f4c44ca4d29475e8cb4f;hp=e0372617ecb76cb57930cc8feaa8847bbb1c1535;hpb=b59a0eedca464cba38e8a6bcfae54db32ac6b15e;p=rocksndiamonds.git

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index e0372617..2252aa6b 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,6 +141,9 @@ 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 *);
@@ -149,19 +153,19 @@ void InitLevelSetupDirectory(char *);
 void ReadChunk_VERS(FILE *, int *, int *);
 void WriteChunk_VERS(FILE *, int, int);
 
-struct LevelDirInfo *newLevelDirInfo();
-void pushLevelDirInfo(struct LevelDirInfo **, struct LevelDirInfo *);
-int numLevelDirInfo(struct LevelDirInfo *);
-boolean validLevelSeries(struct LevelDirInfo *);
-struct LevelDirInfo *getFirstValidLevelSeries(struct LevelDirInfo *);
-struct LevelDirInfo *getLevelDirInfoFirstGroupEntry(struct LevelDirInfo *);
-int numLevelDirInfoInGroup(struct LevelDirInfo *);
-int posLevelDirInfo(struct LevelDirInfo *);
-struct LevelDirInfo *getLevelDirInfoFromPos(struct LevelDirInfo *, int);
-struct LevelDirInfo *getLevelDirInfoFromFilename(char *);
-void dumpLevelDirInfo(struct LevelDirInfo *, int);
-void sortLevelDirInfo(struct LevelDirInfo **,
-		      int (*compare_function)(const void *, const void *));
+TreeInfo *newTreeInfo();
+void pushTreeInfo(TreeInfo **, TreeInfo *);
+int numTreeInfo(TreeInfo *);
+boolean validLevelSeries(TreeInfo *);
+TreeInfo *getFirstValidTreeInfoEntry(TreeInfo *);
+TreeInfo *getTreeInfoFirstGroupEntry(TreeInfo *);
+int numTreeInfoInGroup(TreeInfo *);
+int posTreeInfo(TreeInfo *);
+TreeInfo *getTreeInfoFromPos(TreeInfo *, int);
+TreeInfo *getTreeInfoFromFilename(TreeInfo *, char *);
+void dumpTreeInfo(TreeInfo *, int);
+void sortTreeInfo(TreeInfo **,
+		  int (*compare_function)(const void *, const void *));
 
 char *getUserDataDir(void);
 char *getSetupDir(void);
@@ -183,6 +187,7 @@ char *getSetupValue(int, void *);
 char *getSetupLine(struct TokenInfo *, char *, int);
 
 void LoadLevelInfo(void);
+void LoadArtworkInfo(void);
 void LoadLevelSetup_LastSeries(void);
 void SaveLevelSetup_LastSeries(void);
 void LoadLevelSetup_SeriesInfo(void);