X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffiles.c;h=54835e281f2136a93ba98abcf09ad7b074e122c8;hb=411dffb336bdcdd487225bc78d82bb3bafa3016e;hp=14f9f175cd7ab6be38ee36b66432b63b85f5b2c3;hpb=93d40da6020c70d47690dabb0498648bfb46da1a;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 14f9f175..54835e28 100644
--- a/src/files.c
+++ b/src/files.c
@@ -815,7 +815,7 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] =
   {
     EL_EMC_MAGIC_BALL,			-1,
     TYPE_BOOLEAN,			CONF_VALUE_8_BIT(2),
-    &li.ball_state_initial,		FALSE
+    &li.ball_active_initial,		FALSE
   },
   {
     EL_EMC_MAGIC_BALL,			-1,
@@ -3554,7 +3554,7 @@ static void CopyNativeLevel_RND_to_EM(struct LevelInfo *level)
   cav->android_move_time	= level->android_move_time;
   cav->android_clone_time	= level->android_clone_time;
   cav->ball_random		= level->ball_random;
-  cav->ball_state		= level->ball_state_initial;
+  cav->ball_active		= level->ball_active_initial;
   cav->ball_time		= level->ball_time;
   cav->num_ball_arrays		= level->num_ball_contents;
 
@@ -3567,8 +3567,6 @@ static void CopyNativeLevel_RND_to_EM(struct LevelInfo *level)
 
   cav->wind_direction =
     map_direction_RND_to_EM(level->wind_direction_initial);
-  cav->wind_cnt = (level->wind_direction_initial != MV_NONE ?
-		   cav->wind_time : 0);
 
   for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
     for (j = 0; j < 8; j++)
@@ -3666,7 +3664,7 @@ static void CopyNativeLevel_EM_to_RND(struct LevelInfo *level)
   level->android_move_time	= cav->android_move_time;
   level->android_clone_time	= cav->android_clone_time;
   level->ball_random		= cav->ball_random;
-  level->ball_state_initial	= cav->ball_state;
+  level->ball_active_initial	= cav->ball_active;
   level->ball_time		= cav->ball_time;
   level->num_ball_contents	= cav->num_ball_arrays;
 
@@ -8367,6 +8365,10 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_SWITCH,
     &setup.scroll_delay,			"scroll_delay"
   },
+  {
+    TYPE_SWITCH,
+    &setup.forced_scroll_delay,			"forced_scroll_delay"
+  },
   {
     TYPE_INTEGER,
     &setup.scroll_delay_value,			"scroll_delay_value"
@@ -9112,6 +9114,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->sound_simple = TRUE;
   si->toons = TRUE;
   si->scroll_delay = TRUE;
+  si->forced_scroll_delay = FALSE;
   si->scroll_delay_value = STD_SCROLL_DELAY;
   si->engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_DEFAULT);
   si->engine_snapshot_memory = SNAPSHOT_MEMORY_DEFAULT;
@@ -10306,6 +10309,9 @@ int get_parameter_value(char *value_raw, char *suffix, int type)
     if (string_has_parameter(value, "reverse"))
       result |= STYLE_REVERSE;
 
+    if (string_has_parameter(value, "block_clicks"))
+      result |= STYLE_BLOCK;
+
     if (string_has_parameter(value, "passthrough_clicks"))
       result |= STYLE_PASSTHROUGH;