X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=5096f2b7d0c504eea9cc07de0ffbcf0897ba17fd;hb=2d603d06ca862f3ca0721b66f62da188faf866c4;hp=a644642021f9ccf075ca73af4f347490143a9b83;hpb=0a05f4c2fbfe8ef1c372694a10d94818bff18d09;p=rocksndiamonds.git

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index a6446420..5096f2b7 100644
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -22,20 +22,35 @@
 #define TYPE_SWITCH			(1 << 1)
 #define TYPE_YES_NO			(1 << 2)
 #define TYPE_KEY			(1 << 3)
-#define TYPE_INTEGER			(1 << 4)
-#define TYPE_STRING			(1 << 5)
+#define TYPE_KEY_X11			(1 << 4)
+#define TYPE_INTEGER			(1 << 5)
+#define TYPE_STRING			(1 << 6)
 
 #define TYPE_BOOLEAN_STYLE		(TYPE_BOOLEAN | \
 					 TYPE_SWITCH  | \
 					 TYPE_YES_NO)
 
 /* additional values for setup screen */
-#define TYPE_ENTER_MENU			(1 << 6)
-#define TYPE_LEAVE_MENU			(1 << 7)
-#define TYPE_EMPTY			(1 << 8)
-#define TYPE_GHOSTED			(1 << 9)
+#define TYPE_ENTER_MENU			(1 << 7)
+#define TYPE_LEAVE_MENU			(1 << 8)
+#define TYPE_EMPTY			(1 << 9)
+#define TYPE_KEYTEXT			(1 << 10)
 
-#define TYPE_ENTER_OR_LEAVE_MENU	(TYPE_ENTER_MENU | TYPE_LEAVE_MENU)
+#define TYPE_GHOSTED			(1 << 11)
+#define TYPE_QUERY			(1 << 12)
+
+#define TYPE_VALUE			(TYPE_BOOLEAN_STYLE | \
+					 TYPE_KEY | \
+					 TYPE_KEY_X11 | \
+					 TYPE_INTEGER | \
+					 TYPE_STRING)
+
+#define TYPE_SKIP_ENTRY			(TYPE_EMPTY | \
+					 TYPE_KEY | \
+					 TYPE_STRING)
+
+#define TYPE_ENTER_OR_LEAVE_MENU	(TYPE_ENTER_MENU | \
+					 TYPE_LEAVE_MENU)
 
 /* cookie token for file identifier and version number */
 #define TOKEN_STR_FILE_IDENTIFIER	"file_identifier"
@@ -126,28 +141,28 @@ 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);
-
-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);
@@ -169,6 +184,9 @@ char *getSetupValue(int, void *);
 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);