X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=aa44fc262827a1db45233cd0dd5c2728a427b0f5;hb=1c857c9422067bbce410dcc32e64bc9605649e58;hp=1d4562aebda4a826d41f7f08252210ea99a1f54f;hpb=4dad971280a07058d01449d5e6db2b036470015d;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 1d4562ae..aa44fc26 100644
--- a/src/files.c
+++ b/src/files.c
@@ -7893,41 +7893,40 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_SCROLL_DELAY		6
 #define SETUP_TOKEN_SCROLL_DELAY_VALUE		7
 #define SETUP_TOKEN_ENGINE_SNAPSHOT_MODE	8
-#define SETUP_TOKEN_SOFT_SCROLLING		9
-#define SETUP_TOKEN_FADE_SCREENS		10
-#define SETUP_TOKEN_AUTORECORD			11
-#define SETUP_TOKEN_SHOW_TITLESCREEN		12
-#define SETUP_TOKEN_QUICK_DOORS			13
-#define SETUP_TOKEN_TEAM_MODE			14
-#define SETUP_TOKEN_HANDICAP			15
-#define SETUP_TOKEN_SKIP_LEVELS			16
-#define SETUP_TOKEN_TIME_LIMIT			17
-#define SETUP_TOKEN_FULLSCREEN			18
-#define SETUP_TOKEN_FULLSCREEN_MODE		19
-#define SETUP_TOKEN_WINDOW_SCALING_PERCENT	20
-#define SETUP_TOKEN_WINDOW_SCALING_QUALITY	21
-#define SETUP_TOKEN_ASK_ON_ESCAPE		22
-#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR	23
-#define SETUP_TOKEN_QUICK_SWITCH		24
-#define SETUP_TOKEN_INPUT_ON_FOCUS		25
-#define SETUP_TOKEN_PREFER_AGA_GRAPHICS		26
-#define SETUP_TOKEN_GAME_FRAME_DELAY		27
-#define SETUP_TOKEN_SP_SHOW_BORDER_ELEMENTS	28
-#define SETUP_TOKEN_SMALL_GAME_GRAPHICS		29
-#define SETUP_TOKEN_GRAPHICS_SET		30
-#define SETUP_TOKEN_SOUNDS_SET			31
-#define SETUP_TOKEN_MUSIC_SET			32
-#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS	33
-#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS	34
-#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC	35
-#define SETUP_TOKEN_VOLUME_SIMPLE		36
-#define SETUP_TOKEN_VOLUME_LOOPS		37
-#define SETUP_TOKEN_VOLUME_MUSIC		38
-#define SETUP_TOKEN_TOUCH_CONTROL_TYPE		39
-#define SETUP_TOKEN_TOUCH_MOVE_DISTANCE		40
-#define SETUP_TOKEN_TOUCH_DROP_DISTANCE		41
-
-#define NUM_GLOBAL_SETUP_TOKENS			42
+#define SETUP_TOKEN_FADE_SCREENS		9
+#define SETUP_TOKEN_AUTORECORD			10
+#define SETUP_TOKEN_SHOW_TITLESCREEN		11
+#define SETUP_TOKEN_QUICK_DOORS			12
+#define SETUP_TOKEN_TEAM_MODE			13
+#define SETUP_TOKEN_HANDICAP			14
+#define SETUP_TOKEN_SKIP_LEVELS			15
+#define SETUP_TOKEN_TIME_LIMIT			16
+#define SETUP_TOKEN_FULLSCREEN			17
+#define SETUP_TOKEN_FULLSCREEN_MODE		18
+#define SETUP_TOKEN_WINDOW_SCALING_PERCENT	19
+#define SETUP_TOKEN_WINDOW_SCALING_QUALITY	20
+#define SETUP_TOKEN_ASK_ON_ESCAPE		21
+#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR	22
+#define SETUP_TOKEN_QUICK_SWITCH		23
+#define SETUP_TOKEN_INPUT_ON_FOCUS		24
+#define SETUP_TOKEN_PREFER_AGA_GRAPHICS		25
+#define SETUP_TOKEN_GAME_FRAME_DELAY		26
+#define SETUP_TOKEN_SP_SHOW_BORDER_ELEMENTS	27
+#define SETUP_TOKEN_SMALL_GAME_GRAPHICS		28
+#define SETUP_TOKEN_GRAPHICS_SET		29
+#define SETUP_TOKEN_SOUNDS_SET			30
+#define SETUP_TOKEN_MUSIC_SET			31
+#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS	32
+#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS	33
+#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC	34
+#define SETUP_TOKEN_VOLUME_SIMPLE		35
+#define SETUP_TOKEN_VOLUME_LOOPS		36
+#define SETUP_TOKEN_VOLUME_MUSIC		37
+#define SETUP_TOKEN_TOUCH_CONTROL_TYPE		38
+#define SETUP_TOKEN_TOUCH_MOVE_DISTANCE		39
+#define SETUP_TOKEN_TOUCH_DROP_DISTANCE		40
+
+#define NUM_GLOBAL_SETUP_TOKENS			41
 
 /* editor setup */
 #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH	0
@@ -8066,7 +8065,6 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_SWITCH, &si.scroll_delay,            "scroll_delay"		},
   { TYPE_INTEGER,&si.scroll_delay_value,      "scroll_delay_value"	},
   { TYPE_STRING, &si.engine_snapshot_mode,    "engine_snapshot_mode"	},
-  { TYPE_SWITCH, &si.soft_scrolling,          "soft_scrolling"		},
   { TYPE_SWITCH, &si.fade_screens,            "fade_screens"		},
   { TYPE_SWITCH, &si.autorecord,              "automatic_tape_recording"},
   { TYPE_SWITCH, &si.show_titlescreen,        "show_titlescreen"	},
@@ -8246,7 +8244,6 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->scroll_delay = TRUE;
   si->scroll_delay_value = STD_SCROLL_DELAY;
   si->engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_DEFAULT);
-  si->soft_scrolling = TRUE;
   si->fade_screens = TRUE;
   si->autorecord = TRUE;
   si->show_titlescreen = TRUE;