X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=b2bdf51a50881de2b1003d77dc49b84bc8a077c8;hb=b640b9d7647df4cbba0e530f6f4bcece384048e4;hp=2220e714e1172b3c1318b80f8bde8355e82987b5;hpb=2a357b702b5ceb9bf9173ac02f68cf42340b3158;p=rocksndiamonds.git

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 2220e714..b2bdf51a 100644
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -22,25 +22,27 @@
 #define TYPE_BOOLEAN			(1 << 0)
 #define TYPE_SWITCH			(1 << 1)
 #define TYPE_YES_NO			(1 << 2)
-#define TYPE_KEY			(1 << 3)
-#define TYPE_KEY_X11			(1 << 4)
-#define TYPE_INTEGER			(1 << 5)
-#define TYPE_STRING			(1 << 6)
-#define TYPE_TOKEN			(1 << 7)
+#define TYPE_ECS_AGA			(1 << 3)
+#define TYPE_KEY			(1 << 4)
+#define TYPE_KEY_X11			(1 << 5)
+#define TYPE_INTEGER			(1 << 6)
+#define TYPE_STRING			(1 << 7)
+#define TYPE_TOKEN			(1 << 8)
 
 #define TYPE_BOOLEAN_STYLE		(TYPE_BOOLEAN | \
 					 TYPE_SWITCH  | \
-					 TYPE_YES_NO)
+					 TYPE_YES_NO  | \
+					 TYPE_ECS_AGA )
 
 /* additional values for setup screen */
-#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_ENTER_SCREEN		(1 << 9)
+#define TYPE_ENTER_MENU			(1 << 10)
+#define TYPE_LEAVE_MENU			(1 << 11)
+#define TYPE_EMPTY			(1 << 12)
+#define TYPE_KEYTEXT			(1 << 13)
 
-#define TYPE_GHOSTED			(1 << 13)
-#define TYPE_QUERY			(1 << 14)
+#define TYPE_GHOSTED			(1 << 14)
+#define TYPE_QUERY			(1 << 15)
 
 #define TYPE_VALUE			(TYPE_BOOLEAN_STYLE	| \
 					 TYPE_KEY		| \
@@ -103,9 +105,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
@@ -115,6 +119,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
 
@@ -142,6 +147,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)
@@ -154,6 +162,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 */
@@ -194,13 +203,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 *);
@@ -232,6 +242,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);
@@ -253,12 +265,15 @@ 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 checkSetupFileHashIdentifier(SetupFileHash *, char *, char *);
 void setSetupInfo(struct TokenInfo *, int, char *);
 char *getSetupValue(int, void *);
 char *getSetupLine(struct TokenInfo *, char *, int);
 
+boolean AdjustGraphicsForEMC();
+
 void LoadLevelInfo(void);
 void LoadArtworkInfo(void);
 void LoadLevelArtworkInfo(void);