X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=6e0636ea2a0d99f035f82722866d904cf3c2cec5;hb=98cdb3fce945485772ccc49741fa29051338ce0d;hp=85ec5db1b57f7ced3bd63a5de6272f59e147963c;hpb=8a1c6f39577584e0479ed638ed8b3df11d74f561;p=rocksndiamonds.git

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 85ec5db1..6e0636ea 100644
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -33,13 +33,14 @@
 					 TYPE_YES_NO)
 
 /* additional values for setup screen */
-#define TYPE_ENTER_MENU			(1 << 8)
-#define TYPE_LEAVE_MENU			(1 << 9)
-#define TYPE_EMPTY			(1 << 10)
-#define TYPE_KEYTEXT			(1 << 11)
+#define TYPE_ENTER_SCREEN		(1 << 8)
+#define TYPE_ENTER_MENU			(1 << 9)
+#define TYPE_LEAVE_MENU			(1 << 10)
+#define TYPE_EMPTY			(1 << 11)
+#define TYPE_KEYTEXT			(1 << 12)
 
-#define TYPE_GHOSTED			(1 << 12)
-#define TYPE_QUERY			(1 << 13)
+#define TYPE_GHOSTED			(1 << 13)
+#define TYPE_QUERY			(1 << 14)
 
 #define TYPE_VALUE			(TYPE_BOOLEAN_STYLE	| \
 					 TYPE_KEY		| \
@@ -52,7 +53,8 @@
 					 TYPE_KEY		| \
 					 TYPE_STRING)
 
-#define TYPE_ENTER_OR_LEAVE_MENU	(TYPE_ENTER_MENU	| \
+#define TYPE_ENTER_OR_LEAVE_MENU	(TYPE_ENTER_SCREEN	| \
+					 TYPE_ENTER_MENU	| \
 					 TYPE_LEAVE_MENU)
 
 /* cookie token for file identifier and version number */
@@ -67,7 +69,7 @@ struct TokenInfo
 
 /* some definitions for list and hash handling */
 typedef struct SetupFileList SetupFileList;
-typedef struct hashtable SetupFileHash;
+typedef struct hashtable     SetupFileHash;
 
 #define BEGIN_HASH_ITERATION(hash, itr)				\
   if (hash != NULL && hashtable_count(hash) > 0)		\
@@ -192,12 +194,14 @@ typedef struct hashtable SetupFileHash;
 
 
 char *setLevelArtworkDir(TreeInfo *);
-char *getLevelFilename(int);
 char *getTapeFilename(int);
+char *getSolutionTapeFilename(int);
 char *getScoreFilename(int);
 char *getSetupFilename(void);
 char *getEditorSetupFilename(void);
-char *getElementInfoFilename(void);
+char *getHelpAnimFilename(void);
+char *getHelpTextFilename(void);
+char *getLevelSetInfoFilename(void);
 char *getImageFilename(char *);
 char *getCustomImageFilename(char *);
 char *getCustomSoundFilename(char *);
@@ -229,6 +233,8 @@ void sortTreeInfo(TreeInfo **,
 char *getUserDataDir(void);
 char *getCommonDataDir(void);
 char *getSetupDir(void);
+char *getCurrentLevelDir(void);
+
 void createDirectory(char *, char *, int);
 void InitUserDataDirectory(void);
 void SetFilePermissions(char *, int);
@@ -243,12 +249,14 @@ SetupFileList *newSetupFileList(char *, char *);
 void freeSetupFileList(SetupFileList *);
 char *getListEntry(SetupFileList *, char *);
 SetupFileList *setListEntry(SetupFileList *, char *, char *);
+SetupFileList *addListEntry(SetupFileList *, char *, char *);
 SetupFileList *loadSetupFileList(char *);
 
 SetupFileHash *newSetupFileHash();
 void freeSetupFileHash(SetupFileHash *);
 char *getHashEntry(SetupFileHash *, char *);
 void setHashEntry(SetupFileHash *, char *, char *);
+char *removeHashEntry(SetupFileHash *, char *);
 SetupFileHash *loadSetupFileHash(char *);
 void checkSetupFileHashIdentifier(SetupFileHash *, char *);
 void setSetupInfo(struct TokenInfo *, int, char *);