X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=981411f0a9a171d1cd266232412766f2c1a4e299;hb=216bac7a443561781916af1b643d14a15007db42;hp=d4751ae52b8a4cfb6622a499e9f4f5d3e302be84;hpb=a8167a69b6d4a308f4501b55609ec66dd3082375;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index d4751ae5..981411f0 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;
 
@@ -3988,7 +3986,7 @@ static void CopyNativeTape_SP_to_RND(struct LevelInfo *level)
     int demo_repeat = (demo->data[i] & 0xf0) >> 4;
     int tape_action = map_key_SP_to_RND(demo_action);
     int tape_repeat = demo_repeat + 1;
-    byte action[MAX_PLAYERS] = { tape_action, 0, 0, 0 };
+    byte action[MAX_TAPE_ACTIONS] = { tape_action };
     boolean success = 0;
     int j;
 
@@ -10311,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;