X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=1cb235ced68f5daa059138da80c795251f411423;hb=96626a07ae084d613fd85fa9eb87fd8b3495af59;hp=a81a3f060eb5fb6c779404a29da9c2e9f1569326;hpb=90f1e0612952c4d351b7ad0dea460c7825696f2b;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index a81a3f06..1cb235ce 100644
--- a/src/files.c
+++ b/src/files.c
@@ -6196,7 +6196,6 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
   boolean invalid_playfield_char = FALSE;
   boolean load_xsb_to_ces = check_special_flags("load_xsb_to_ces");
   int file_level_nr = 0;
-  int line_nr = 0;
   int x = 0, y = 0;		// initialized to make compilers happy
 
   last_comment[0] = '\0';
@@ -6238,10 +6237,6 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
     if (!getStringFromFile(file, line, MAX_LINE_LEN))
       break;
 
-    // check if line was completely read and is terminated by line break
-    if (strlen(line) > 0 && line[strlen(line) - 1] == '\n')
-      line_nr++;
-
     // cut trailing line break (this can be newline and/or carriage return)
     for (line_ptr = &line[strlen(line)]; line_ptr >= line; line_ptr--)
       if ((*line_ptr == '\n' || *line_ptr == '\r') && *(line_ptr + 1) == '\0')
@@ -9813,6 +9808,14 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_SWITCH,
     &setup.bd_skip_hatching,			"bd_skip_hatching"
   },
+  {
+    TYPE_SWITCH,
+    &setup.bd_scroll_delay,			"bd_scroll_delay"
+  },
+  {
+    TYPE_SWITCH3,
+    &setup.bd_smooth_movements,			"bd_smooth_movements"
+  },
   {
     TYPE_SWITCH,
     &setup.sp_show_border_elements,		"sp_show_border_elements"
@@ -10631,6 +10634,8 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->game_frame_delay = GAME_FRAME_DELAY;
   si->bd_skip_uncovering = FALSE;
   si->bd_skip_hatching = FALSE;
+  si->bd_scroll_delay = TRUE;
+  si->bd_smooth_movements = AUTO;
   si->sp_show_border_elements = FALSE;
   si->small_game_graphics = FALSE;
   si->show_load_save_buttons = FALSE;
@@ -11977,7 +11982,7 @@ static int get_anim_action_parameter_value(char *token)
   {
     if (isURL(token))
     {
-      result = get_hash_from_key(token);	// unsigned int => int
+      result = get_hash_from_string(token);	// unsigned int => int
       result = ABS(result);			// may be negative now
       result += (result < MAX_IMAGE_FILES ? MAX_IMAGE_FILES : 0);
 
@@ -12079,7 +12084,7 @@ int get_parameter_value(char *value_raw, char *suffix, int type)
   else if (strEqual(suffix, ".class"))
   {
     result = (strEqual(value, ARG_UNDEFINED) ? ARG_UNDEFINED_VALUE :
-	      get_hash_from_key(value));
+	      get_hash_from_string(value));
   }
   else if (strEqual(suffix, ".style"))
   {