X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=fa807e8f323dd0161959467fb6553ca5a703da52;hb=90cd4dc88df3f891ecaa0ee9b9010fe432154503;hp=bc076598094227a1dfece0a6d33d359ff7a2b188;hpb=58ea80c54f5a1e6605e2c33b554dff1fcc0c26b5;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index bc076598..fa807e8f 100644
--- a/src/files.c
+++ b/src/files.c
@@ -768,9 +768,15 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] =
     &li.android_clone_time,		10
   },
   {
-    EL_EMC_ANDROID,			-1,
+    EL_EMC_ANDROID,			SAVE_CONF_NEVER,
     TYPE_ELEMENT_LIST,			CONF_VALUE_BYTES(1),
     &li.android_clone_element[0],	EL_EMPTY, NULL,
+    &li.num_android_clone_elements,	1, MAX_ANDROID_ELEMENTS_OLD
+  },
+  {
+    EL_EMC_ANDROID,			-1,
+    TYPE_ELEMENT_LIST,			CONF_VALUE_BYTES(2),
+    &li.android_clone_element[0],	EL_EMPTY, NULL,
     &li.num_android_clone_elements,	1, MAX_ANDROID_ELEMENTS
   },
 
@@ -809,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,
@@ -1727,6 +1733,9 @@ static void setLevelInfoToDefaults_Level(struct LevelInfo *level)
   // set all bug compatibility flags to "false" => do not emulate this bug
   level->use_action_after_change_bug = FALSE;
 
+  // other flags that may be set due to certain level properties
+  level->has_mouse_events = FALSE;
+
   if (leveldir_current)
   {
     // try to determine better author name than 'anonymous'
@@ -3548,7 +3557,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;
 
@@ -3561,8 +3570,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++)
@@ -3660,7 +3667,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;
 
@@ -6557,6 +6564,18 @@ static void LoadLevel_InitCustomElements(struct LevelInfo *level)
       element_info[element].ignition_delay = 8;
     }
   }
+
+  // check for custom elements which have mouse click events defined
+  for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
+  {
+    int element = EL_CUSTOM_START + i;
+
+    if (HAS_CHANGE_EVENT(element, CE_CLICKED_BY_MOUSE) ||
+	HAS_CHANGE_EVENT(element, CE_PRESSED_BY_MOUSE) ||
+	HAS_CHANGE_EVENT(element, CE_MOUSE_CLICKED_ON_X) ||
+	HAS_CHANGE_EVENT(element, CE_MOUSE_PRESSED_ON_X))
+      level->has_mouse_events = TRUE;
+  }
 }
 
 static void LoadLevel_InitElements(struct LevelInfo *level)
@@ -8361,6 +8380,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"
@@ -9106,6 +9129,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;
@@ -10300,6 +10324,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;