X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=67a4c28287dc997a173b487e758dcc71a96cd805;hb=fda8c9f42aa13663ad6b2f698da787a7280b9965;hp=9939437ab1c0cc962e2c108571027850a552c00d;hpb=983c38dbae8637ef26d8be356e04c9b64bf9fc1f;p=rocksndiamonds.git

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 9939437a..67a4c282 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)		\
@@ -101,9 +103,11 @@ typedef struct hashtable SetupFileHash;
 #define LEVELCLASS_SP_END		699
 #define LEVELCLASS_DX_START		700
 #define LEVELCLASS_DX_END		799
+#define LEVELCLASS_SB_START		800
+#define LEVELCLASS_SB_END		899
 
 #define LEVELCLASS_PREDEFINED_START	LEVELCLASS_TUTORIAL_START
-#define LEVELCLASS_PREDEFINED_END	LEVELCLASS_DX_END
+#define LEVELCLASS_PREDEFINED_END	LEVELCLASS_SB_END
 
 #define LEVELCLASS_TUTORIAL		LEVELCLASS_TUTORIAL_START
 #define LEVELCLASS_CLASSICS		LEVELCLASS_CLASSICS_START
@@ -113,6 +117,7 @@ typedef struct hashtable SetupFileHash;
 #define LEVELCLASS_EM			LEVELCLASS_EM_START
 #define LEVELCLASS_SP			LEVELCLASS_SP_START
 #define LEVELCLASS_DX			LEVELCLASS_DX_START
+#define LEVELCLASS_SB			LEVELCLASS_SB_START
 
 #define LEVELCLASS_UNDEFINED		999
 
@@ -140,6 +145,9 @@ typedef struct hashtable SetupFileHash;
 #define IS_LEVELCLASS_DX(p)						\
 	((p)->sort_priority >= LEVELCLASS_DX_START &&			\
 	 (p)->sort_priority <= LEVELCLASS_DX_END)
+#define IS_LEVELCLASS_SB(p)						\
+	((p)->sort_priority >= LEVELCLASS_SB_START &&			\
+	 (p)->sort_priority <= LEVELCLASS_SB_END)
 #define IS_LEVELCLASS_UNDEFINED(p)					\
 	((p)->sort_priority < LEVELCLASS_PREDEFINED_START ||		\
 	 (p)->sort_priority > LEVELCLASS_PREDEFINED_END)
@@ -152,6 +160,7 @@ typedef struct hashtable SetupFileHash;
 			 IS_LEVELCLASS_EM(n) ? LEVELCLASS_EM :		   \
 			 IS_LEVELCLASS_SP(n) ? LEVELCLASS_SP :		   \
 			 IS_LEVELCLASS_DX(n) ? LEVELCLASS_DX :		   \
+			 IS_LEVELCLASS_SB(n) ? LEVELCLASS_SB :		   \
 			 LEVELCLASS_UNDEFINED)
 
 /* sort priorities of artwork */
@@ -192,11 +201,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 *getHelpAnimFilename(void);
+char *getHelpTextFilename(void);
+char *getLevelSetInfoFilename(void);
 char *getImageFilename(char *);
 char *getCustomImageFilename(char *);
 char *getCustomSoundFilename(char *);
@@ -228,6 +240,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);
@@ -242,12 +256,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 *);