X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=87cb4cbafb83eb91dfd7125cdda0cd69f3729cd9;hb=8e17da8cdff134bfa0e766a50f408a3c06428f54;hp=67a4c28287dc997a173b487e758dcc71a96cd805;hpb=fda8c9f42aa13663ad6b2f698da787a7280b9965;p=rocksndiamonds.git

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 67a4c282..87cb4cba 100644
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -22,26 +22,37 @@
 #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_ENTER_MENU			(1 << 10)
+#define TYPE_LEAVE_MENU			(1 << 11)
+#define TYPE_EMPTY			(1 << 12)
+#define TYPE_KEYTEXT			(1 << 13)
+
+#define TYPE_GHOSTED			(1 << 14)
+#define TYPE_QUERY			(1 << 15)
+
+/* additional values for internal purposes */
+#define TYPE_BITFIELD			(1 << 16)
+#define TYPE_ELEMENT			(1 << 17)
+#define TYPE_CONTENT			(1 << 18)
+#define TYPE_ELEMENT_LIST		(1 << 19)
+#define TYPE_CONTENT_LIST		(1 << 20)
+
+/* 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		| \
@@ -237,11 +248,15 @@ void dumpTreeInfo(TreeInfo *, int);
 void sortTreeInfo(TreeInfo **,
 		  int (*compare_function)(const void *, const void *));
 
-char *getUserDataDir(void);
+char *getHomeDir(void);
 char *getCommonDataDir(void);
+char *getPersonalDataDir(void);
+char *getUserGameDataDir(void);
 char *getSetupDir(void);
 char *getCurrentLevelDir(void);
 
+void fixUserGameDataDir(void);
+
 void createDirectory(char *, char *, int);
 void InitUserDataDirectory(void);
 void SetFilePermissions(char *, int);
@@ -265,11 +280,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);