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

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 5096f2b7..3f61ab84 100644
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -134,6 +134,42 @@ 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 *getLevelFilename(int);
 char *getTapeFilename(int);
@@ -159,7 +195,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 *));