X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=bfaadc79a92289d2867f07a0eca6418d2a014a54;hb=d0a7080670f9a2fa96138cf1c06708016a42d615;hp=090584b50d438a68eed3ce638aa0b8758da4073a;hpb=abe44529b439ad39b4d8dbf19cbd67c9b9844279;p=rocksndiamonds.git

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 090584b5..bfaadc79 100644
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -38,16 +38,17 @@
 #define TYPE_ENTER_LIST			(1 << 16)
 #define TYPE_LEAVE_LIST			(1 << 17)
 #define TYPE_EMPTY			(1 << 18)
-#define TYPE_KEYTEXT			(1 << 19)
+#define TYPE_SKIPPABLE			(1 << 19)
+#define TYPE_KEYTEXT			(1 << 20)
 
-#define TYPE_GHOSTED			(1 << 20)
-#define TYPE_QUERY			(1 << 21)
+#define TYPE_GHOSTED			(1 << 21)
+#define TYPE_QUERY			(1 << 22)
 
 /* 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 << 23)
+#define TYPE_CONTENT			(1 << 24)
+#define TYPE_ELEMENT_LIST		(1 << 25)
+#define TYPE_CONTENT_LIST		(1 << 26)
 
 /* derived values for setup file handling */
 #define TYPE_BOOLEAN_STYLE		(TYPE_BOOLEAN | \
@@ -67,6 +68,7 @@
 					 TYPE_GRAPHIC)
 
 #define TYPE_SKIP_ENTRY			(TYPE_EMPTY		| \
+					 TYPE_SKIPPABLE		| \
 					 TYPE_KEY		| \
 					 TYPE_STRING		| \
 					 TYPE_GHOSTED)
@@ -81,9 +83,6 @@
 
 #define TYPE_ENTER_OR_LEAVE		(TYPE_ENTER | TYPE_LEAVE)
 
-/* cookie token for file identifier and version number */
-#define TOKEN_STR_FILE_IDENTIFIER	"file_identifier"
-
 struct TokenInfo
 {
   int type;
@@ -225,10 +224,13 @@ typedef struct hashtable     SetupFileHash;
 
 
 char *setLevelArtworkDir(TreeInfo *);
+char *getProgramMainDataPath(char *, char *);
+char *getProgramConfigFilename(char *);
 char *getTapeFilename(int);
 char *getSolutionTapeFilename(int);
 char *getScoreFilename(int);
 char *getSetupFilename(void);
+char *getDefaultSetupFilename(void);
 char *getEditorSetupFilename(void);
 char *getHelpAnimFilename(void);
 char *getHelpTextFilename(void);
@@ -271,15 +273,16 @@ char *getCommonDataDir(void);
 char *getPersonalDataDir(void);
 char *getUserGameDataDir(void);
 char *getSetupDir(void);
+char *getUserLevelDir(char *);
 char *getCurrentLevelDir(void);
-
-void updateUserGameDataDir(void);
+char *getNewUserLevelSubdir(void);
 
 void createDirectory(char *, char *, int);
 void InitUserDataDirectory(void);
 void SetFilePermissions(char *, int);
 
 char *getCookie(char *);
+void fprintFileHeader(FILE *, char *);
 int getFileVersionFromCookieString(const char *);
 boolean checkCookieString(const char *, const char *);
 
@@ -300,7 +303,6 @@ char *getHashEntry(SetupFileHash *, char *);
 void setHashEntry(SetupFileHash *, char *, char *);
 char *removeHashEntry(SetupFileHash *, char *);
 SetupFileHash *loadSetupFileHash(char *);
-void checkSetupFileHashIdentifier(SetupFileHash *, char *, char *);
 void setSetupInfo(struct TokenInfo *, int, char *);
 char *getSetupValue(int, void *);
 char *getSetupLine(struct TokenInfo *, char *, int);
@@ -313,6 +315,13 @@ void LoadLevelInfo(void);
 void LoadArtworkInfo(void);
 void LoadLevelArtworkInfo(void);
 
+char *getArtworkIdentifierForUserLevelSet(int);
+TreeInfo *getArtworkTreeInfoForUserLevelSet(int);
+boolean checkIfCustomArtworkExistsForCurrentLevelSet();
+void AddUserLevelSetToLevelInfo(char *);
+boolean UpdateUserLevelSet(char *, char *, char *, int);
+boolean CreateUserLevelSet(char *, char *, char *, int, boolean);
+
 void LoadLevelSetup_LastSeries(void);
 void SaveLevelSetup_LastSeries(void);
 void SaveLevelSetup_LastSeries_Deactivate();