X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=59700cf9cf70011ed01b71ed1e224d313ccc85e6;hp=8ec6b4d8dc14fd616eea7c3ee8ff06564ded463e;hb=HEAD;hpb=17f6f3b42db10ad8c384ba5ebd1e6a7ecbfbe494

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 8ec6b4d8..59700cf9 100644
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -114,6 +114,11 @@ typedef struct hashtable     SetupFileHash;
   }								\
 
 
+// sort priorities of special tree entries
+#define LEVELCLASS_TOP			0
+#define LEVELCLASS_PARENT		1
+#define LEVELCLASS_LAST_PLAYED_LEVEL	2
+
 // sort priorities of level series (also used as level series classes)
 #define LEVELCLASS_TUTORIAL_START	10
 #define LEVELCLASS_TUTORIAL_END		99
@@ -228,17 +233,19 @@ typedef struct hashtable     SetupFileHash;
 			 ARTWORKCLASS_UNDEFINED)
 
 #define TREE_SORTING_DIR(ti)						\
-	(((ti)->parent_link					? 0 :	\
-	  (ti)->in_user_dir					? 4 :	\
-	  (ti)->sort_priority >= LEVELCLASS_CLASSICS_START	? 3 :	\
-	  (ti)->sort_priority >= LEVELCLASS_TUTORIAL_START	? 2 :	\
-	  1) * 2 +							\
-	 ((ti)->level_group ? 0 : 1))
+	(((ti)->parent_link				   ? 0 :	\
+	  (ti)->in_user_dir				   ? 4 * 200 :	\
+	  (ti)->sort_priority >= LEVELCLASS_CLASSICS_START ? 3 * 200 +	\
+	  (ti)->sort_priority % 100 :					\
+	  (ti)->sort_priority >= LEVELCLASS_TUTORIAL_START ? 2 * 200 +	\
+	  (ti)->sort_priority % 100 :					\
+	  1 * 200) +							\
+	 ((ti)->level_group ? 0 : 100))
 
 #define TREE_COLOR_DIR(ti, active)					\
 	((active)			? FC_YELLOW :			\
-	 TREE_SORTING(ti) / 2 == 4	? FC_GREEN :			\
-	 TREE_SORTING(ti) / 2 == 2	? FC_BLUE :			\
+	 TREE_SORTING(ti) / 200 == 4	? FC_GREEN :			\
+	 TREE_SORTING(ti) / 200 == 2	? FC_BLUE :			\
 	 FC_RED)
 
 #define TREE_SORTING(ti)						\
@@ -257,15 +264,25 @@ char *setLevelArtworkDir(TreeInfo *);
 char *getProgramMainDataPath(char *, char *);
 char *getProgramConfigFilename(char *);
 char *getTapeFilename(int);
+char *getTemporaryTapeFilename(void);
+char *getDefaultSolutionTapeFilename(int);
+char *getSokobanSolutionTapeFilename(int);
 char *getSolutionTapeFilename(int);
 char *getScoreFilename(int);
+char *getScoreCacheFilename(int);
+char *getScoreTapeBasename(char *);
+char *getScoreTapeFilename(char *, int);
+char *getScoreCacheTapeFilename(char *, int);
 char *getSetupFilename(void);
 char *getDefaultSetupFilename(void);
+char *getPlatformSetupFilename(void);
 char *getEditorSetupFilename(void);
 char *getHelpAnimFilename(void);
 char *getHelpTextFilename(void);
-char *getLevelSetInfoFilename(void);
+char *getLevelSetInfoFilename(int);
 char *getLevelSetTitleMessageFilename(int, boolean);
+char *getCreditsFilename(int, boolean);
+char *getProgramInfoFilename(int);
 char *getImageFilename(char *);
 char *getCustomImageFilename(char *);
 char *getCustomSoundFilename(char *);
@@ -274,9 +291,18 @@ char *getCustomArtworkFilename(char *, int);
 char *getCustomArtworkConfigFilename(int);
 char *getCustomArtworkLevelConfigFilename(int);
 char *getCustomMusicDirectory(void);
+char *getCustomMusicDirectory_NoConf(void);
+
+void MarkTapeDirectoryUploadsAsComplete(char *);
+void MarkTapeDirectoryUploadsAsIncomplete(char *);
+boolean CheckTapeDirectoryUploadsComplete(char *);
 
+void InitMissingFileHash(void);
 void InitTapeDirectory(char *);
 void InitScoreDirectory(char *);
+void InitScoreCacheDirectory(char *);
+void InitScoreTapeDirectory(char *, int);
+void InitScoreCacheTapeDirectory(char *, int);
 void InitUserLevelDirectory(char *);
 void InitNetworkLevelDirectory(char *);
 void InitLevelSetupDirectory(char *);
@@ -287,21 +313,23 @@ void pushTreeInfo(TreeInfo **, TreeInfo *);
 void removeTreeInfo(TreeInfo **);
 int numTreeInfo(TreeInfo *);
 boolean validLevelSeries(TreeInfo *);
+TreeInfo *getValidLevelSeries(TreeInfo *, TreeInfo *);
 TreeInfo *getFirstValidTreeInfoEntry(TreeInfo *);
+TreeInfo *getNextValidTreeInfoEntry(TreeInfo *);
 TreeInfo *getTreeInfoFirstGroupEntry(TreeInfo *);
 int numTreeInfoInGroup(TreeInfo *);
 int getPosFromTreeInfo(TreeInfo *);
 TreeInfo *getTreeInfoFromPos(TreeInfo *, int);
 TreeInfo *getTreeInfoFromIdentifier(TreeInfo *, char *);
-void dumpTreeInfo(TreeInfo *, int);
+int dumpTreeInfo(TreeInfo *, int);
 void sortTreeInfoBySortFunction(TreeInfo **,
 				int (*compare_function)(const void *,
 							const void *));
 void sortTreeInfo(TreeInfo **);
 void freeTreeInfo(TreeInfo *);
+TreeInfo *addTopTreeInfoNode(TreeInfo *);
 
 char *getHomeDir(void);
-char *getCommonDataDir(void);
 char *getPersonalDataDir(void);
 char *getMainUserGameDataDir(void);
 char *getUserGameDataDir(void);
@@ -311,13 +339,13 @@ char *getUserLevelDir(char *);
 char *getNetworkLevelDir(char *);
 char *getCurrentLevelDir(void);
 char *getNewUserLevelSubdir(void);
+char *getTapeDir(char *);
 
-void createDirectory(char *, char *, int);
+void createDirectory(char *, char *);
 void InitMainUserDataDirectory(void);
 void InitUserDataDirectory(void);
 void SetFilePermissions(char *, int);
 
-char *getCookie(char *);
 void fprintFileHeader(FILE *, char *);
 int getFileVersionFromCookieString(const char *);
 boolean checkCookieString(const char *, const char *);
@@ -344,6 +372,7 @@ char *getSetupValue(int, void *);
 char *getSetupLine(struct TokenInfo *, char *, int);
 
 unsigned int get_hash_from_key(void *);
+int hash_keys_are_equal(void *, void *);
 
 int GetZipFileTreeType(char *);
 char *ExtractZipFileIntoDirectory(char *, char *, int);
@@ -367,6 +396,10 @@ boolean UpdateUserLevelSet(char *, char *, char *, int);
 boolean CreateUserLevelSet(char *, char *, char *, int, boolean);
 
 void UpdateLastPlayedLevels_TreeInfo(void);
+void StoreLastPlayedLevels(TreeInfo *);
+void ForcedStoreLastPlayedLevels(TreeInfo *);
+void RestoreLastPlayedLevels(TreeInfo **);
+boolean CheckLastPlayedLevels(void);
 
 void LoadLevelSetup_LastSeries(void);
 void SaveLevelSetup_LastSeries(void);