X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=278269ab354acced5172a2b88cd9d0686aa9b02c;hp=2f1f65a9986c34df05aa9fbad7bbb1673c2bead2;hb=115ce6f2da1914d68b0fe0e5f9082973190dacdd;hpb=3742724070e341b044fdfedfd0bb5780d64fb554

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 2f1f65a9..278269ab 100644
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -27,27 +27,29 @@
 #define TYPE_KEY_X11			(1 << 7)
 #define TYPE_INTEGER			(1 << 8)
 #define TYPE_STRING			(1 << 9)
-#define TYPE_ELEMENT			(1 << 10)
-#define TYPE_GRAPHIC			(1 << 11)
+#define TYPE_PLAYER			(1 << 10)
+#define TYPE_ELEMENT			(1 << 11)
+#define TYPE_GRAPHIC			(1 << 12)
 
 /* additional values for setup screen */
-#define TYPE_ENTER_SCREEN		(1 << 12)
-#define TYPE_LEAVE_SCREEN		(1 << 13)
-#define TYPE_ENTER_MENU			(1 << 14)
-#define TYPE_LEAVE_MENU			(1 << 15)
-#define TYPE_ENTER_LIST			(1 << 16)
-#define TYPE_LEAVE_LIST			(1 << 17)
-#define TYPE_EMPTY			(1 << 18)
-#define TYPE_KEYTEXT			(1 << 19)
-
-#define TYPE_GHOSTED			(1 << 20)
-#define TYPE_QUERY			(1 << 21)
+#define TYPE_ENTER_SCREEN		(1 << 13)
+#define TYPE_LEAVE_SCREEN		(1 << 14)
+#define TYPE_ENTER_MENU			(1 << 15)
+#define TYPE_LEAVE_MENU			(1 << 16)
+#define TYPE_ENTER_LIST			(1 << 17)
+#define TYPE_LEAVE_LIST			(1 << 18)
+#define TYPE_EMPTY			(1 << 19)
+#define TYPE_SKIPPABLE			(1 << 20)
+#define TYPE_KEYTEXT			(1 << 21)
+
+#define TYPE_GHOSTED			(1 << 22)
+#define TYPE_QUERY			(1 << 23)
 
 /* additional values for internal purposes */
-#define TYPE_BITFIELD			(1 << 22)
-#define TYPE_CONTENT			(1 << 23)
-#define TYPE_ELEMENT_LIST		(1 << 24)
-#define TYPE_CONTENT_LIST		(1 << 25)
+#define TYPE_BITFIELD			(1 << 24)
+#define TYPE_CONTENT			(1 << 25)
+#define TYPE_ELEMENT_LIST		(1 << 26)
+#define TYPE_CONTENT_LIST		(1 << 27)
 
 /* derived values for setup file handling */
 #define TYPE_BOOLEAN_STYLE		(TYPE_BOOLEAN | \
@@ -63,10 +65,12 @@
 					 TYPE_KEY_X11		| \
 					 TYPE_INTEGER		| \
 					 TYPE_STRING		| \
+					 TYPE_PLAYER		| \
 					 TYPE_ELEMENT		| \
 					 TYPE_GRAPHIC)
 
 #define TYPE_SKIP_ENTRY			(TYPE_EMPTY		| \
+					 TYPE_SKIPPABLE		| \
 					 TYPE_KEY		| \
 					 TYPE_STRING		| \
 					 TYPE_GHOSTED)
@@ -246,9 +250,10 @@ char *getCustomMusicDirectory(void);
 void InitTapeDirectory(char *);
 void InitScoreDirectory(char *);
 void InitUserLevelDirectory(char *);
+void InitNetworkLevelDirectory(char *);
 void InitLevelSetupDirectory(char *);
 
-TreeInfo *newTreeInfo();
+TreeInfo *newTreeInfo(void);
 TreeInfo *newTreeInfo_setDefaults(int);
 void pushTreeInfo(TreeInfo **, TreeInfo *);
 int numTreeInfo(TreeInfo *);
@@ -271,6 +276,8 @@ char *getCommonDataDir(void);
 char *getPersonalDataDir(void);
 char *getUserGameDataDir(void);
 char *getSetupDir(void);
+char *getUserLevelDir(char *);
+char *getNetworkLevelDir(char *);
 char *getCurrentLevelDir(void);
 char *getNewUserLevelSubdir(void);
 
@@ -294,7 +301,7 @@ SetupFileList *setListEntry(SetupFileList *, char *, char *);
 SetupFileList *addListEntry(SetupFileList *, char *, char *);
 SetupFileList *loadSetupFileList(char *);
 
-SetupFileHash *newSetupFileHash();
+SetupFileHash *newSetupFileHash(void);
 void freeSetupFileHash(SetupFileHash *);
 char *getHashEntry(SetupFileHash *, char *);
 void setHashEntry(SetupFileHash *, char *, char *);
@@ -306,19 +313,22 @@ char *getSetupLine(struct TokenInfo *, char *, int);
 
 unsigned int get_hash_from_key(void *);
 
-boolean AdjustGraphicsForEMC();
+boolean AdjustGraphicsForEMC(void);
 
 void LoadLevelInfo(void);
 void LoadArtworkInfo(void);
 void LoadLevelArtworkInfo(void);
 
+char *getArtworkIdentifierForUserLevelSet(int);
+TreeInfo *getArtworkTreeInfoForUserLevelSet(int);
+boolean checkIfCustomArtworkExistsForCurrentLevelSet(void);
 void AddUserLevelSetToLevelInfo(char *);
 boolean UpdateUserLevelSet(char *, char *, char *, int);
-boolean CreateUserLevelSet(char *, char *, char *, int);
+boolean CreateUserLevelSet(char *, char *, char *, int, boolean);
 
 void LoadLevelSetup_LastSeries(void);
 void SaveLevelSetup_LastSeries(void);
-void SaveLevelSetup_LastSeries_Deactivate();
+void SaveLevelSetup_LastSeries_Deactivate(void);
 void LoadLevelSetup_SeriesInfo(void);
 void SaveLevelSetup_SeriesInfo(void);