X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=2db4961c53cbedd3c9d939c9e13339b8c7558025;hb=3bb225da5092d0741870829d9f8f8642070d29c5;hp=0ec8a491bb113cb185891f8caf038d49e9d548ea;hpb=bc84d4e4ec1babe815cb9e5b07168afa232bffb5;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 0ec8a491..2db4961c 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -22,6 +22,8 @@
 #include "windows.h"
 #elif defined(PLATFORM_ANDROID)
 #include "android.h"
+#elif defined(PLATFORM_EMSCRIPTEN)
+#include "emscripten.h"
 #endif
 
 #include "sdl.h"
@@ -581,6 +583,9 @@
 					 JOY_BUTTON_2 :			 \
 					 JOY_NO_ACTION)
 
+// maximum number of level sets in the level set history
+#define MAX_LEVELDIR_HISTORY	12
+
 // default name for empty highscore entry
 #define EMPTY_PLAYER_NAME	"no name"
 
@@ -771,6 +776,11 @@
 #define NUM_BASE_TREE_TYPES	4
 #define NUM_TREE_TYPES		6
 
+#define TREE_TYPE_IS_DIR(type)	((type) == TREE_TYPE_GRAPHICS_DIR ||	\
+				 (type) == TREE_TYPE_SOUNDS_DIR ||	\
+				 (type) == TREE_TYPE_MUSIC_DIR ||	\
+				 (type) == TREE_TYPE_LEVEL_DIR)
+
 #define INFOTEXT_UNDEFINED	""
 #define INFOTEXT_GRAPHICS_DIR	"Custom Graphics"
 #define INFOTEXT_SOUNDS_DIR	"Custom Sounds"
@@ -779,6 +789,10 @@
 #define INFOTEXT_LEVEL_NR	"Levels"
 #define INFOTEXT_PLAYER_NAME	"Players & Teams"
 
+#define BACKLINK_TEXT_MAIN	".. (main menu)"
+#define BACKLINK_TEXT_SETUP	".. (setup menu)"
+#define BACKLINK_TEXT_PARENT	".. (parent directory)"
+
 #define TREE_INFOTEXT(t)	((t) == TREE_TYPE_PLAYER_NAME ?		\
 				 INFOTEXT_PLAYER_NAME :			\
 				 (t) == TREE_TYPE_LEVEL_NR ?		\
@@ -793,6 +807,10 @@
 				 INFOTEXT_MUSIC_DIR :			\
 				 INFOTEXT_UNDEFINED)
 
+#define TREE_BACKLINK_TEXT(t)	((t) == TREE_TYPE_LEVEL_DIR ?		\
+				 BACKLINK_TEXT_MAIN :			\
+				 BACKLINK_TEXT_SETUP)
+
 #define TREE_USERDIR(t)		((t) == TREE_TYPE_LEVEL_DIR ?		\
 				 getUserLevelDir(NULL) :		\
 				 (t) == TREE_TYPE_GRAPHICS_DIR ?	\
@@ -1294,6 +1312,11 @@ struct SetupAutoSetupInfo
   int editor_zoom_tilesize;
 };
 
+struct SetupLevelSetupInfo
+{
+  char *last_level_series[MAX_LEVELDIR_HISTORY + 1];
+};
+
 struct SetupEditorCascadeInfo
 {
   boolean el_bd;
@@ -1427,7 +1450,8 @@ struct SetupInfo
   boolean skip_levels;
   boolean increment_levels;
   boolean auto_play_next_level;
-  boolean skip_scores_after_game;
+  boolean count_score_after_game;
+  boolean show_scores_after_game;
   boolean time_limit;
   boolean fullscreen;
   int window_scaling_percent;
@@ -1437,6 +1461,8 @@ struct SetupInfo
   boolean ask_on_escape;
   boolean ask_on_escape_editor;
   boolean ask_on_game_over;
+  boolean ask_on_quit_game;
+  boolean ask_on_quit_program;
   boolean quick_switch;
   boolean input_on_focus;
   boolean prefer_aga_graphics;
@@ -1464,6 +1490,8 @@ struct SetupInfo
   char *network_server_hostname;
 
   struct SetupAutoSetupInfo auto_setup;
+  struct SetupLevelSetupInfo level_setup;
+
   struct SetupEditorInfo editor;
   struct SetupEditorCascadeInfo editor_cascade;
   struct SetupShortcutInfo shortcut;
@@ -1537,6 +1565,7 @@ struct TreeInfo
 
   boolean level_group;	// directory contains more level series directories
   boolean parent_link;	// entry links back to parent directory
+  boolean is_copy;	// this entry is a copy of another entry in the tree
   boolean in_user_dir;	// user defined levels are stored in home directory
   boolean user_defined;	// levels in user directory and marked as "private"
   boolean readonly;	// readonly levels can not be changed with editor