rnd-20020430-1-src

[rocksndiamonds.git] / src / libgame / setup.h

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 44dd664f871ccb53128f9c9456e0f942d8361ad1..2252aa6bdc6dc955cb368a2962f5b5c02f20d4fe 100644 (file)
--- 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 *);
@@ -153,12 +157,12 @@ 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 *));