X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=d3328728e626245a9d74ed90ef9b802cff246b38;hb=4fcf5c6436d34bdc44bc534d21d9ec95bf072333;hp=a1813a4c308df05245635d0c651460f98bce138d;hpb=884db54d739f5838243315f390d28634cb99a7d9;p=rocksndiamonds.git

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index a1813a4c..d3328728 100644
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -55,14 +55,6 @@
 /* cookie token for file identifier and version number */
 #define TOKEN_STR_FILE_IDENTIFIER	"file_identifier"
 
-/* structures for setup file handling */
-struct SetupFileList
-{
-  char *token;
-  char *value;
-  struct SetupFileList *next;
-};
-
 struct TokenInfo
 {
   int type;
@@ -134,7 +126,44 @@ 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)
+
+
+void setLevelArtworkDir(TreeInfo *);
 char *getLevelFilename(int);
 char *getTapeFilename(int);
 char *getScoreFilename(int);
@@ -142,6 +171,8 @@ char *getSetupFilename(void);
 char *getImageFilename(char *);
 char *getCustomImageFilename(char *);
 char *getCustomSoundFilename(char *);
+char *getCustomArtworkFilename(char *, int);
+char *getCustomArtworkConfigFilename(int);
 char *getCustomMusicDirectory(void);
 
 void InitTapeDirectory(char *);
@@ -149,9 +180,6 @@ 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 *);
@@ -161,7 +189,7 @@ TreeInfo *getTreeInfoFirstGroupEntry(TreeInfo *);
 int numTreeInfoInGroup(TreeInfo *);
 int posTreeInfo(TreeInfo *);
 TreeInfo *getTreeInfoFromPos(TreeInfo *, int);
-TreeInfo *getTreeInfoFromFilename(TreeInfo *, char *);
+TreeInfo *getTreeInfoFromIdentifier(TreeInfo *, char *);
 void dumpTreeInfo(TreeInfo *, int);
 void sortTreeInfo(TreeInfo **,
 		  int (*compare_function)(const void *, const void *));
@@ -179,6 +207,7 @@ boolean checkCookieString(const char *, const char *);
 char *getFormattedSetupEntry(char *, char *);
 void freeSetupFileList(struct SetupFileList *);
 char *getTokenValue(struct SetupFileList *, char *);
+void setTokenValue(struct SetupFileList *, char *, char *);
 struct SetupFileList *loadSetupFileList(char *);
 void checkSetupFileListIdentifier(struct SetupFileList *, char *);
 void setSetupInfo(struct TokenInfo *, int, char *);
@@ -187,7 +216,8 @@ char *getSetupLine(struct TokenInfo *, char *, int);
 
 void LoadLevelInfo(void);
 void LoadArtworkInfo(void);
-void LoadSoundsInfo(void);
+void LoadLevelArtworkInfo(void);
+
 void LoadLevelSetup_LastSeries(void);
 void SaveLevelSetup_LastSeries(void);
 void LoadLevelSetup_SeriesInfo(void);