X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=edbef12d9b9237e3f6edd9c35075868ad147b022;hb=9e3b9d32e82663858c54a3884a2bb7680d458218;hp=838a898daaaa6170505afd35893051939941cbf2;hpb=90cd4dc88df3f891ecaa0ee9b9010fe432154503;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index 838a898d..edbef12d 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -2092,10 +2092,11 @@ static struct ValueTextInfo options_action_type[] =
   { CA_SET_LEVEL_SCORE,		"set score"			},
   { CA_SET_LEVEL_GEMS,		"set gems"			},
   { CA_SET_LEVEL_WIND,		"set wind dir."			},
-  { CA_SET_LEVEL_RANDOM_SEED,	"set rand. seed"		},
+  { CA_SET_LEVEL_RANDOM_SEED,	"set random seed"		},
   { CA_UNDEFINED,		" "				},
   { CA_HEADLINE_PLAYER_ACTIONS,	"[player]"			},
   { CA_MOVE_PLAYER,		"move player"			},
+  { CA_MOVE_PLAYER_NEW,		"move player new"		},
   { CA_EXIT_PLAYER,		"exit player"			},
   { CA_KILL_PLAYER,		"kill player"			},
   { CA_SET_PLAYER_KEYS,		"set keys"			},
@@ -2421,6 +2422,7 @@ action_arg_options[] =
   { CA_EXIT_PLAYER,		0,	options_action_arg_player,	},
   { CA_KILL_PLAYER,		0,	options_action_arg_player,	},
   { CA_MOVE_PLAYER,		0,	options_action_arg_direction,	},
+  { CA_MOVE_PLAYER_NEW,		0,	options_action_arg_direction,	},
   { CA_RESTART_LEVEL,		0,	options_action_arg_none,	},
   { CA_SHOW_ENVELOPE,		0,	options_action_arg_envelope,	},
   { CA_SET_LEVEL_TIME,		3,	options_action_arg_number,	},
@@ -2673,7 +2675,7 @@ static struct
   {
     ED_ELEMENT_SETTINGS_XPOS(1),	ED_ELEMENT_SETTINGS_YPOS(13),
     GADGET_ID_ACTION_TYPE,		GADGET_ID_NONE,
-    -1,
+    15,
     options_action_type,
     &custom_element_change.action_type,
     NULL, NULL, NULL,			"action on specified condition"
@@ -4054,13 +4056,13 @@ static int editor_el_emerald_mine_club[] =
 
   EL_EMC_MAGIC_BALL,
   EL_EMC_MAGIC_BALL_SWITCH,
-  EL_SPRING,
-  EL_EMC_SPRING_BUMPER,
-
   EL_EMC_LENSES,
   EL_EMC_MAGNIFIER,
-  EL_EMPTY,
-  EL_EMPTY,
+
+  EL_SPRING_LEFT,
+  EL_SPRING,
+  EL_SPRING_RIGHT,
+  EL_EMC_SPRING_BUMPER,
 
   EL_BALLOON,
   EL_YAMYAM_UP,
@@ -9739,6 +9741,8 @@ static struct
   { EL_EMC_LENSES,	&level.lenses_score,		TEXT_COLLECTING	},
   { EL_EMC_MAGNIFIER,	&level.magnify_score,		TEXT_COLLECTING	},
   { EL_SPRING,		&level.slurp_score,		TEXT_SLURPING	},
+  { EL_SPRING_LEFT,	&level.slurp_score,		TEXT_SLURPING	},
+  { EL_SPRING_RIGHT,	&level.slurp_score,		TEXT_SLURPING	},
   { EL_EMC_LENSES,	&level.lenses_time,		TEXT_DURATION	},
   { EL_EMC_MAGNIFIER,	&level.magnify_time,		TEXT_DURATION	},
   { EL_MM_FUSE_ACTIVE,	&level.mm_time_fuse,		TEXT_DELAY_OFF	},
@@ -10014,7 +10018,9 @@ static void DrawPropertiesConfig(void)
   if (MAYBE_DONT_COLLIDE_WITH(properties_element))
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH);
 
-  if (properties_element == EL_SPRING)
+  if (properties_element == EL_SPRING ||
+      properties_element == EL_SPRING_LEFT ||
+      properties_element == EL_SPRING_RIGHT)
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_SPRING_BUG);
 
   if (properties_element == EL_TIME_ORB_FULL)