X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=e55217c01259ee73c0b6345dd07b03e4665887f9;hb=8cea50fbd1b74a2bc164a79cbd26bdbb3abd6689;hp=6e0636ea2a0d99f035f82722866d904cf3c2cec5;hpb=9c285b0e8e4d81c5559815c5f7142685ce865206;p=rocksndiamonds.git

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 6e0636ea..e55217c0 100644
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -22,26 +22,40 @@
 #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)
 
+/* additional values for setup screen */
+#define TYPE_ENTER_SCREEN		(1 << 9)
+#define TYPE_LEAVE_SCREEN		(1 << 10)
+#define TYPE_ENTER_MENU			(1 << 11)
+#define TYPE_LEAVE_MENU			(1 << 12)
+#define TYPE_ENTER_LIST			(1 << 13)
+#define TYPE_LEAVE_LIST			(1 << 14)
+#define TYPE_EMPTY			(1 << 15)
+#define TYPE_KEYTEXT			(1 << 16)
+
+#define TYPE_GHOSTED			(1 << 17)
+#define TYPE_QUERY			(1 << 18)
+
+/* additional values for internal purposes */
+#define TYPE_BITFIELD			(1 << 19)
+#define TYPE_ELEMENT			(1 << 20)
+#define TYPE_CONTENT			(1 << 21)
+#define TYPE_ELEMENT_LIST		(1 << 22)
+#define TYPE_CONTENT_LIST		(1 << 23)
+
+/* derived values for setup file handling */
 #define TYPE_BOOLEAN_STYLE		(TYPE_BOOLEAN | \
 					 TYPE_SWITCH  | \
-					 TYPE_YES_NO)
-
-/* 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_GHOSTED			(1 << 13)
-#define TYPE_QUERY			(1 << 14)
+					 TYPE_YES_NO  | \
+					 TYPE_ECS_AGA )
 
+/* derived values for setup screen */
 #define TYPE_VALUE			(TYPE_BOOLEAN_STYLE	| \
 					 TYPE_KEY		| \
 					 TYPE_KEY_X11		| \
@@ -51,11 +65,15 @@
 
 #define TYPE_SKIP_ENTRY			(TYPE_EMPTY		| \
 					 TYPE_KEY		| \
-					 TYPE_STRING)
+					 TYPE_STRING		| \
+					 TYPE_GHOSTED)
 
-#define TYPE_ENTER_OR_LEAVE_MENU	(TYPE_ENTER_SCREEN	| \
+#define TYPE_ENTER_OR_LEAVE		(TYPE_ENTER_SCREEN	| \
+					 TYPE_LEAVE_SCREEN	| \
 					 TYPE_ENTER_MENU	| \
-					 TYPE_LEAVE_MENU)
+					 TYPE_LEAVE_MENU	| \
+					 TYPE_ENTER_LIST	| \
+					 TYPE_LEAVE_LIST)
 
 /* cookie token for file identifier and version number */
 #define TOKEN_STR_FILE_IDENTIFIER	"file_identifier"
@@ -103,9 +121,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 +135,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 +163,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 +178,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 */
@@ -217,6 +242,7 @@ void InitUserLevelDirectory(char *);
 void InitLevelSetupDirectory(char *);
 
 TreeInfo *newTreeInfo();
+TreeInfo *newTreeInfo_setDefaults(int);
 void pushTreeInfo(TreeInfo **, TreeInfo *);
 int numTreeInfo(TreeInfo *);
 boolean validLevelSeries(TreeInfo *);
@@ -227,14 +253,20 @@ int posTreeInfo(TreeInfo *);
 TreeInfo *getTreeInfoFromPos(TreeInfo *, int);
 TreeInfo *getTreeInfoFromIdentifier(TreeInfo *, char *);
 void dumpTreeInfo(TreeInfo *, int);
-void sortTreeInfo(TreeInfo **,
-		  int (*compare_function)(const void *, const void *));
+void sortTreeInfoBySortFunction(TreeInfo **,
+				int (*compare_function)(const void *,
+							const void *));
+void sortTreeInfo(TreeInfo **);
 
-char *getUserDataDir(void);
+char *getHomeDir(void);
 char *getCommonDataDir(void);
+char *getPersonalDataDir(void);
+char *getUserGameDataDir(void);
 char *getSetupDir(void);
 char *getCurrentLevelDir(void);
 
+void updateUserGameDataDir(void);
+
 void createDirectory(char *, char *, int);
 void InitUserDataDirectory(void);
 void SetFilePermissions(char *, int);
@@ -258,11 +290,13 @@ 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);