X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=8c79f19d692c9a85d6b255b6da3f5f3ffe78f8cd;hb=c9c4509483fdd52fb18925662c295ba5610237ed;hp=90a7fe4fe2a7b3160f3a163c4301a506bcf3f3e1;hpb=fb0df571e1a4207bc756e73f7954e1ba05fa1fad;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 90a7fe4f..8c79f19d 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
@@ -370,6 +372,7 @@
 #define ANIM_ALL		(1 << 14)
 #define ANIM_ONCE		(1 << 15)
 #define ANIM_TILED		(1 << 16)
+#define ANIM_RANDOM_STATIC	(1 << 17)
 
 #define ANIM_DEFAULT		ANIM_LOOP
 
@@ -651,6 +654,8 @@
 #define TAPES_DIRECTORY		"tapes"
 #define SCORES_DIRECTORY	"scores"
 #define DOCS_DIRECTORY		"docs"
+#define ELEMENTS_DIRECTORY	"elements"
+#define CREDITS_DIRECTORY	"credits"
 #define CACHE_DIRECTORY		"cache"
 #define CONF_DIRECTORY		"conf"
 #define NETWORK_DIRECTORY	"network"
@@ -788,9 +793,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 ||	\
@@ -804,12 +810,16 @@
 #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 BACKLINK_TEXT_SCORES	"back"
 
-#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 :			\
@@ -823,7 +833,9 @@
 				 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 ?		\
+				 BACKLINK_TEXT_SCORES :			\
+				 (t) == TREE_TYPE_LEVEL_DIR ?		\
 				 BACKLINK_TEXT_MAIN :			\
 				 BACKLINK_TEXT_SETUP)
 
@@ -1354,6 +1366,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;
@@ -1363,6 +1376,8 @@ struct SetupShortcutInfo
 {
   Key save_game;
   Key load_game;
+  Key restart_game;
+  Key pause_before_end;
   Key toggle_pause;
 
   Key focus_player[MAX_PLAYERS];
@@ -1466,6 +1481,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;
@@ -1594,6 +1610,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
 
@@ -2012,6 +2029,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 *);