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

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 44dd664f..67f42611 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)
@@ -133,32 +134,69 @@ struct TokenInfo
 			 IS_LEVELCLASS_DX(n) ? LEVELCLASS_DX : \
 			 LEVELCLASS_UNDEFINED)
 
-
+/* sort priorities of artwork */
+#define ARTWORKCLASS_CLASSICS_START	100
+#define ARTWORKCLASS_CLASSICS_END	199
+#define ARTWORKCLASS_CONTRIBUTION_START	200
+#define ARTWORKCLASS_CONTRIBUTION_END	299
+#define ARTWORKCLASS_LEVEL_START	300
+#define ARTWORKCLASS_LEVEL_END		399
+#define ARTWORKCLASS_USER_START		400
+#define ARTWORKCLASS_USER_END		499
+
+#define ARTWORKCLASS_CLASSICS		ARTWORKCLASS_CLASSICS_START
+#define ARTWORKCLASS_CONTRIBUTION	ARTWORKCLASS_CONTRIBUTION_START
+#define ARTWORKCLASS_LEVEL		ARTWORKCLASS_LEVEL_START
+#define ARTWORKCLASS_USER		ARTWORKCLASS_USER_START
+
+#define ARTWORKCLASS_UNDEFINED		999
+
+#define IS_ARTWORKCLASS_CLASSICS(p) \
+	((p)->sort_priority >= ARTWORKCLASS_CLASSICS_START && \
+	 (p)->sort_priority <= ARTWORKCLASS_CLASSICS_END)
+#define IS_ARTWORKCLASS_CONTRIBUTION(p) \
+	((p)->sort_priority >= ARTWORKCLASS_CONTRIBUTION_START && \
+	 (p)->sort_priority <= ARTWORKCLASS_CONTRIBUTION_END)
+#define IS_ARTWORKCLASS_LEVEL(p) \
+	((p)->sort_priority >= ARTWORKCLASS_LEVEL_START && \
+	 (p)->sort_priority <= ARTWORKCLASS_LEVEL_END)
+#define IS_ARTWORKCLASS_USER(p) \
+	((p)->sort_priority >= ARTWORKCLASS_USER_START && \
+	 (p)->sort_priority <= ARTWORKCLASS_USER_END)
+
+#define ARTWORKCLASS(n)	(IS_ARTWORKCLASS_CLASSICS(n) ? ARTWORKCLASS_CLASSICS :\
+			 IS_ARTWORKCLASS_CONTRIBUTION(n) ? ARTWORKCLASS_CONTRIBUTION : \
+			 IS_ARTWORKCLASS_LEVEL(n) ? ARTWORKCLASS_LEVEL : \
+			 IS_ARTWORKCLASS_USER(n) ? ARTWORKCLASS_USER : \
+			 ARTWORKCLASS_UNDEFINED)
+
+
+char *getLevelArtworkDir(TreeInfo *);
 char *getLevelFilename(int);
 char *getTapeFilename(int);
 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 *getTreeInfoFromIdentifier(TreeInfo *, char *);
 void dumpTreeInfo(TreeInfo *, int);
 void sortTreeInfo(TreeInfo **,
 		  int (*compare_function)(const void *, const void *));
@@ -184,6 +222,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);