X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=inline;f=src%2Flibgame%2Fsystem.h;h=123ddc9b7c63240f443a8574b3415c4b0f191ff7;hb=fb8b92a605e8a9d509f14b08e35d902984e5dd6b;hp=327cba881e18ab2b806c4823691f5056e6b53df4;hpb=207dd0ba7951139a27a87a091c7eb98c395f3c70;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 327cba88..123ddc9b 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -175,6 +175,8 @@
 // default shortcut keys
 #define DEFAULT_KEY_SAVE_GAME		KSYM_F1
 #define DEFAULT_KEY_LOAD_GAME		KSYM_F2
+#define DEFAULT_KEY_RESTART_GAME	KSYM_F3
+#define DEFAULT_KEY_PAUSE_BEFORE_END	KSYM_F4
 #define DEFAULT_KEY_TOGGLE_PAUSE	KSYM_space
 #define DEFAULT_KEY_FOCUS_PLAYER_1	KSYM_F5
 #define DEFAULT_KEY_FOCUS_PLAYER_2	KSYM_F6
@@ -789,9 +791,10 @@
 #define TREE_TYPE_LEVEL_DIR	3
 #define TREE_TYPE_LEVEL_NR	4
 #define TREE_TYPE_PLAYER_NAME	5
+#define TREE_TYPE_SCORE_ENTRY	6
 
 #define NUM_BASE_TREE_TYPES	4
-#define NUM_TREE_TYPES		6
+#define NUM_TREE_TYPES		7
 
 #define TREE_TYPE_IS_DIR(type)	((type) == TREE_TYPE_GRAPHICS_DIR ||	\
 				 (type) == TREE_TYPE_SOUNDS_DIR ||	\
@@ -805,12 +808,15 @@
 #define INFOTEXT_LEVEL_DIR	"Level Sets"
 #define INFOTEXT_LEVEL_NR	"Levels"
 #define INFOTEXT_PLAYER_NAME	"Players & Teams"
+#define INFOTEXT_SCORE_ENTRY	"Hall of Fame"
 
 #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 ?		\
+#define TREE_INFOTEXT(t)	((t) == TREE_TYPE_SCORE_ENTRY ?		\
+				 INFOTEXT_SCORE_ENTRY :			\
+				 (t) == TREE_TYPE_PLAYER_NAME ?		\
 				 INFOTEXT_PLAYER_NAME :			\
 				 (t) == TREE_TYPE_LEVEL_NR ?		\
 				 INFOTEXT_LEVEL_NR :			\
@@ -824,7 +830,8 @@
 				 INFOTEXT_MUSIC_DIR :			\
 				 INFOTEXT_UNDEFINED)
 
-#define TREE_BACKLINK_TEXT(t)	((t) == TREE_TYPE_LEVEL_DIR ?		\
+#define TREE_BACKLINK_TEXT(t)	((t) == TREE_TYPE_SCORE_ENTRY ||	\
+				 (t) == TREE_TYPE_LEVEL_DIR ?		\
 				 BACKLINK_TEXT_MAIN :			\
 				 BACKLINK_TEXT_SETUP)
 
@@ -1355,6 +1362,7 @@ struct SetupEditorCascadeInfo
   boolean el_steel_chars;
   boolean el_ce;
   boolean el_ge;
+  boolean el_es;
   boolean el_ref;
   boolean el_user;
   boolean el_dynamic;
@@ -1364,6 +1372,8 @@ struct SetupShortcutInfo
 {
   Key save_game;
   Key load_game;
+  Key restart_game;
+  Key pause_before_end;
   Key toggle_pause;
 
   Key focus_player[MAX_PLAYERS];
@@ -1467,6 +1477,7 @@ struct SetupInfo
   int engine_snapshot_memory;
   boolean fade_screens;
   boolean autorecord;
+  boolean auto_pause_on_start;
   boolean show_titlescreen;
   boolean quick_doors;
   boolean team_mode;
@@ -1595,6 +1606,7 @@ struct TreeInfo
   int first_level;	// first level number (to allow start with 0 or 1)
   int last_level;	// last level number (automatically calculated)
   int sort_priority;	// sort levels by 'sort_priority' and then by name
+  int pos;		// custom position information of node in tree
 
   boolean latest_engine;// force level set to use the latest game engine
 
@@ -2013,6 +2025,7 @@ KeyMod GetKeyModStateFromEvents(void);
 void StartTextInput(int, int, int, int);
 void StopTextInput(void);
 void PushUserEvent(int, int, int);
+boolean PendingEscapeKeyEvent(void);
 
 void InitJoysticks(void);
 boolean ReadJoystick(int, int *, int *, boolean *, boolean *);