X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=dc6d0f363d69f438b6e4c52cbafb2e8a5508eea2;hb=a3d3dca44696b194dbe3f49a97d8c92d92b42ecf;hp=6706f2014241f2b935cbbb5fedb6e74ffbda1d32;hpb=b197ad86c0801f6139e4f147bf22bd375c9dfb63;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 6706f201..dc6d0f36 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -197,6 +197,8 @@
 #define DEFAULT_KEY_SNAP_RIGHT		KSYM_UNDEFINED
 #define DEFAULT_KEY_SNAP_UP		KSYM_UNDEFINED
 #define DEFAULT_KEY_SNAP_DOWN		KSYM_UNDEFINED
+#define DEFAULT_KEY_SPEED_FAST		KSYM_f
+#define DEFAULT_KEY_SPEED_SLOW		KSYM_s
 
 // default debug setup keys and values
 #define DEFAULT_FRAME_DELAY_0		20		// 100 % speed
@@ -1114,6 +1116,8 @@ struct AudioSystemInfo
   char *device_name;
   int device_fd;
 
+  int sample_rate;
+
   int num_channels;
   int music_channel;
   int first_sound_channel;
@@ -1335,8 +1339,8 @@ struct SetupLevelSetupInfo
 struct SetupEditorCascadeInfo
 {
   boolean el_bd;
-  boolean el_bd_native;
-  boolean el_bd_effects;
+  boolean el_bdx;
+  boolean el_bdx_effects;
   boolean el_em;
   boolean el_emc;
   boolean el_rnd;
@@ -1382,6 +1386,9 @@ struct SetupShortcutInfo
   Key snap_right;
   Key snap_up;
   Key snap_down;
+
+  Key speed_fast;
+  Key speed_slow;
 };
 
 struct SetupSystemInfo
@@ -1439,6 +1446,7 @@ struct SetupInternalInfo
   boolean menu_shortcuts_tape;
   boolean menu_shortcuts_sound;
   boolean menu_shortcuts_snap;
+  boolean menu_shortcuts_speed;
 
   boolean info_title;
   boolean info_elements;
@@ -1489,6 +1497,7 @@ struct SetupInfo
   boolean team_mode;
   boolean handicap;
   boolean skip_levels;
+  boolean allow_skipping_levels;
   boolean increment_levels;
   boolean auto_play_next_level;
   boolean count_score_after_game;
@@ -1516,10 +1525,10 @@ struct SetupInfo
   boolean bd_skip_hatching;
   boolean bd_scroll_delay;
   boolean bd_show_invisible_outbox;
-  int bd_smooth_movements;		// not boolean -- can also be "AUTO"
-  int bd_pushing_graphics;		// not boolean -- can also be "AUTO"
-  int bd_up_down_graphics;		// not boolean -- can also be "AUTO"
-  int bd_skip_falling_sounds;		// not boolean -- can also be "AUTO"
+  int bd_smooth_movements;		// not boolean -- can also be "MODE_AUTO"
+  int bd_pushing_graphics;		// not boolean -- can also be "MODE_AUTO"
+  int bd_up_down_graphics;		// not boolean -- can also be "MODE_AUTO"
+  int bd_skip_falling_sounds;		// not boolean -- can also be "MODE_AUTO"
   int bd_palette_c64;
   int bd_palette_c64dtv;
   int bd_palette_atari;
@@ -1534,13 +1543,14 @@ struct SetupInfo
   char *graphics_set;
   char *sounds_set;
   char *music_set;
-  int override_level_graphics;		// not boolean -- can also be "AUTO"
-  int override_level_sounds;		// not boolean -- can also be "AUTO"
-  int override_level_music;		// not boolean -- can also be "AUTO"
+  int override_level_graphics;		// not boolean -- can also be "MODE_AUTO"
+  int override_level_sounds;		// not boolean -- can also be "MODE_AUTO"
+  int override_level_music;		// not boolean -- can also be "MODE_AUTO"
 
   int volume_simple;
   int volume_loops;
   int volume_music;
+  boolean audio_sample_rate_44100;
 
   boolean network_mode;
   int network_player_nr;