cleanup of unnecessarily convoluted function call

[rocksndiamonds.git] / src / libgame / system.h

diff --git a/src/libgame/system.h b/src/libgame/system.h
index b0cda2a6e32b8130c3c337286547c12fce8302e5..85c26a5f34fd84c1b50939b92bf603fff89972cb 100644 (file)
--- 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
@@ -1061,6 +1063,8 @@ struct OptionInfo
   char *identifier;
   char *level_nr;
 
+  char *drop_file;
+
   int display_nr;
 
   boolean mytapes;
@@ -1114,6 +1118,8 @@ struct AudioSystemInfo
   char *device_name;
   int device_fd;
 
+  int sample_rate;
+
   int num_channels;
   int music_channel;
   int first_sound_channel;
@@ -1316,6 +1322,7 @@ struct SetupEditorInfo
   boolean el_by_type;
 
   boolean show_element_token;
+  boolean fast_game_start;
 
   boolean show_read_only_warning;
 
@@ -1335,8 +1342,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 +1389,9 @@ struct SetupShortcutInfo
   Key snap_right;
   Key snap_up;
   Key snap_down;
+
+  Key speed_fast;
+  Key speed_slow;
 };
 
 struct SetupSystemInfo
@@ -1439,6 +1449,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 +1500,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;
@@ -1511,14 +1523,20 @@ struct SetupInfo
   boolean prefer_extra_panel_items;
   boolean game_speed_extended;
   int game_frame_delay;
+  int default_game_engine_type;
   boolean bd_skip_uncovering;
   boolean bd_skip_hatching;
   boolean bd_scroll_delay;
-  int bd_smooth_movements;             // not boolean -- can also be "AUTO"
+  boolean bd_show_invisible_outbox;
+  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_falling_sounds;               // not boolean -- can also be "MODE_AUTO"
   int bd_palette_c64;
   int bd_palette_c64dtv;
   int bd_palette_atari;
   int bd_default_color_type;
+  int bd_random_colors;
   boolean sp_show_border_elements;
   boolean small_game_graphics;
   boolean show_load_save_buttons;
@@ -1528,13 +1546,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;
@@ -2042,6 +2061,7 @@ KeyMod GetKeyModStateFromEvents(void);
 void StartTextInput(int, int, int, int);
 void StopTextInput(void);
 void PushUserEvent(int, int, int);
+void PushDropEvent(char *);
 boolean PendingEscapeKeyEvent(void);
 
 void InitJoysticks(void);