X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=2e317c3d21440addc0cc9f800045fd7330195aa6;hb=fa628a204ea4662806244b0ed994a48b40ece2ca;hp=0dc86233de69ac195ba275cf7173e5c35ff43aa3;hpb=70b6d1af1a18c70b698cac732ec04e69ac32315c;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index 0dc86233..2e317c3d 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -2489,7 +2489,7 @@ static struct
     "slip down from certain flat walls","use EM style slipping behaviour"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(0),	ED_ELEMENT_SETTINGS_YPOS(1),
+    ED_ELEMENT_SETTINGS_XPOS(0),	ED_ELEMENT_SETTINGS_YPOS(2),
     GADGET_ID_USE_SPRING_BUG,		GADGET_ID_NONE,
     &level.use_spring_bug,
     NULL,
@@ -3355,6 +3355,11 @@ static int editor_el_emerald_mine_club[] =
   EL_EMC_FAKE_GRASS,
   EL_EMPTY,
   EL_EMPTY,
+
+  EL_EM_DYNAMITE,
+  EL_EM_DYNAMITE_ACTIVE,
+  EL_EMPTY,
+  EL_EMPTY,
 };
 static int *editor_hl_emerald_mine_club_ptr = editor_hl_emerald_mine_club;
 static int *editor_el_emerald_mine_club_ptr = editor_el_emerald_mine_club;
@@ -7625,7 +7630,7 @@ static void DrawPropertiesInfo()
 
 #define TEXT_COLLECTING		"Score for collecting"
 #define TEXT_SMASHING		"Score for smashing"
-#define TEXT_SLURPING		"Score for slurping"
+#define TEXT_SLURPING		"Score for slurping robot"
 #define TEXT_CRACKING		"Score for cracking"
 #define TEXT_AMOEBA_SPEED	"Speed of amoeba growth"
 #define TEXT_DURATION		"Duration when activated"
@@ -7686,6 +7691,7 @@ static struct
   { EL_PACMAN_DOWN,	&level.score[SC_PACMAN],	TEXT_SMASHING	},
   { EL_NUT,		&level.score[SC_NUT],		TEXT_CRACKING	},
   { EL_DYNAMITE,	&level.score[SC_DYNAMITE],	TEXT_COLLECTING	},
+  { EL_EM_DYNAMITE,	&level.score[SC_DYNAMITE],	TEXT_COLLECTING	},
   { EL_DYNABOMB_INCREASE_NUMBER,&level.score[SC_DYNAMITE],TEXT_COLLECTING },
   { EL_DYNABOMB_INCREASE_SIZE,	&level.score[SC_DYNAMITE],TEXT_COLLECTING },
   { EL_DYNABOMB_INCREASE_POWER,	&level.score[SC_DYNAMITE],TEXT_COLLECTING },
@@ -7736,7 +7742,7 @@ static struct
   { EL_EMC_MAGIC_BALL,	&level.ball_time,		TEXT_BALL_DELAY	},
   { EL_EMC_LENSES,	&level.lenses_score,		TEXT_COLLECTING	},
   { EL_EMC_MAGNIFIER,	&level.magnify_score,		TEXT_COLLECTING	},
-  { EL_ROBOT,		&level.slurp_score,		TEXT_SLURPING	},
+  { EL_SPRING,		&level.slurp_score,		TEXT_SLURPING	},
   { EL_EMC_LENSES,	&level.lenses_time,		TEXT_DURATION	},
   { EL_EMC_MAGNIFIER,	&level.magnify_time,		TEXT_DURATION	},
 #endif
@@ -9906,7 +9912,7 @@ void HandleLevelEditorKeyInput(Key key)
       case KSYM_Escape:
         if (edit_mode == ED_MODE_DRAWING)
 	{
-	  RequestExitLevelEditor(setup.ask_on_escape);
+	  RequestExitLevelEditor(setup.ask_on_escape_editor);
 	}
         else if (edit_mode == ED_MODE_INFO)
 	{