X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=4e5e7c831d386fb453b4ebe34ee2e3ba7c92de7e;hb=dc51f089096a0c775d2a03d0b862a14d6ce88d51;hp=53c877712b787c7140744c4de06c1b75a2d7d076;hpb=b9781a9921b1ae15f27c737a3da7c00b3f7a9f7e;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 53c87771..4e5e7c83 100644
--- a/src/files.c
+++ b/src/files.c
@@ -10772,19 +10772,23 @@ static struct TokenInfo global_setup_tokens[] =
     &setup.bd_scroll_delay,			"bd_scroll_delay"
   },
   {
-    TYPE_SWITCH3,
+    TYPE_SWITCH,
+    &setup.bd_show_invisible_outbox,		"bd_show_invisible_outbox"
+  },
+  {
+    TYPE_SWITCH_3_STATES,
     &setup.bd_smooth_movements,			"bd_smooth_movements"
   },
   {
-    TYPE_SWITCH3,
+    TYPE_SWITCH_3_STATES,
     &setup.bd_pushing_graphics,			"bd_pushing_graphics"
   },
   {
-    TYPE_SWITCH3,
+    TYPE_SWITCH_3_STATES,
     &setup.bd_up_down_graphics,			"bd_up_down_graphics"
   },
   {
-    TYPE_SWITCH3,
+    TYPE_SWITCH_3_STATES,
     &setup.bd_skip_falling_sounds,		"bd_skip_falling_sounds"
   },
   {
@@ -10840,15 +10844,15 @@ static struct TokenInfo global_setup_tokens[] =
     &setup.music_set,				"music_set"
   },
   {
-    TYPE_SWITCH3,
+    TYPE_SWITCH_3_STATES,
     &setup.override_level_graphics,		"override_level_graphics"
   },
   {
-    TYPE_SWITCH3,
+    TYPE_SWITCH_3_STATES,
     &setup.override_level_sounds,		"override_level_sounds"
   },
   {
-    TYPE_SWITCH3,
+    TYPE_SWITCH_3_STATES,
     &setup.override_level_music,		"override_level_music"
   },
   {
@@ -10863,6 +10867,10 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_INTEGER,
     &setup.volume_music,			"volume_music"
   },
+  {
+    TYPE_SWITCH,
+    &setup.audio_sample_rate_44100,		"audio_sample_rate_44100"
+  },
   {
     TYPE_SWITCH,
     &setup.network_mode,			"network_mode"
@@ -11183,6 +11191,14 @@ static struct TokenInfo shortcut_setup_tokens[] =
     TYPE_KEY_X11,
     &setup.shortcut.snap_down,			"shortcut.snap_down"
   },
+  {
+    TYPE_KEY_X11,
+    &setup.shortcut.speed_fast,			"shortcut.speed_fast"
+  },
+  {
+    TYPE_KEY_X11,
+    &setup.shortcut.speed_slow,			"shortcut.speed_slow"
+  },
 };
 
 static struct SetupInputInfo setup_input;
@@ -11424,6 +11440,10 @@ static struct TokenInfo internal_setup_tokens[] =
     TYPE_BOOLEAN,
     &setup.internal.menu_shortcuts_snap,	"menu_shortcuts_snap"
   },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.menu_shortcuts_speed,	"menu_shortcuts_speed"
+  },
   {
     TYPE_BOOLEAN,
     &setup.internal.info_title,			"info_title"
@@ -11552,7 +11572,7 @@ static struct TokenInfo debug_setup_tokens[] =
     &setup.debug.show_frames_per_second,	"debug.show_frames_per_second"
   },
   {
-    TYPE_SWITCH3,
+    TYPE_SWITCH_3_STATES,
     &setup.debug.xsn_mode,			"debug.xsn_mode"
   },
   {
@@ -11631,10 +11651,11 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->bd_skip_uncovering = FALSE;
   si->bd_skip_hatching = FALSE;
   si->bd_scroll_delay = TRUE;
-  si->bd_smooth_movements = AUTO;
+  si->bd_show_invisible_outbox = FALSE;
+  si->bd_smooth_movements = MODE_AUTO;
   si->bd_pushing_graphics = TRUE;
   si->bd_up_down_graphics = TRUE;
-  si->bd_skip_falling_sounds = AUTO;
+  si->bd_skip_falling_sounds = MODE_AUTO;
   si->bd_palette_c64 = GD_DEFAULT_PALETTE_C64;
   si->bd_palette_c64dtv = GD_DEFAULT_PALETTE_C64DTV;
   si->bd_palette_atari = GD_DEFAULT_PALETTE_ATARI;
@@ -11657,6 +11678,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->volume_simple = 100;		// percent
   si->volume_loops = 100;		// percent
   si->volume_music = 100;		// percent
+  si->audio_sample_rate_44100 = FALSE;
 
   si->network_mode = FALSE;
   si->network_player_nr = 0;		// first player
@@ -11779,6 +11801,9 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->shortcut.snap_up		= DEFAULT_KEY_SNAP_UP;
   si->shortcut.snap_down	= DEFAULT_KEY_SNAP_DOWN;
 
+  si->shortcut.speed_fast	= DEFAULT_KEY_SPEED_FAST;
+  si->shortcut.speed_slow	= DEFAULT_KEY_SPEED_SLOW;
+
   for (i = 0; i < MAX_PLAYERS; i++)
   {
     si->input[i].use_joystick = FALSE;
@@ -11858,7 +11883,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
 
   si->debug.show_frames_per_second = FALSE;
 
-  si->debug.xsn_mode = AUTO;
+  si->debug.xsn_mode = MODE_AUTO;
   si->debug.xsn_percent = 0;
 
   si->options.verbose = FALSE;
@@ -12426,7 +12451,7 @@ void SaveSetup_Default(void)
   fprintf(file, "\n");
   for (i = 0; i < ARRAY_SIZE(debug_setup_tokens); i++)
     if (!strPrefix(debug_setup_tokens[i].text, "debug.xsn_") ||
-	setup.debug.xsn_mode != AUTO)
+	setup.debug.xsn_mode != MODE_AUTO)
       fprintf(file, "%s\n", getSetupLine(debug_setup_tokens, "", i));
 
   fprintf(file, "\n");