X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=086988438429ca414f8b1c73591498112a6007fc;hb=325decda20f8562b0ce596370d53882979e517c8;hp=b7b739f5145bfab4cc27355d7a8a7f20c6e850a4;hpb=7bcc6aa833d64b21f78793dd00ed4c1356b98d05;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index b7b739f5..08698843 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -12162,6 +12162,9 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
 	  ptr++;
 	}
 
+	// remap some (historic, now obsolete) elements
+	element = getMappedElement(element);
+
 	if (element >= NUM_FILE_ELEMENTS)
 	  element = EL_UNKNOWN;
 
@@ -12237,6 +12240,36 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
       lev_fieldx = level.fieldx = brush_width;
       lev_fieldy = level.fieldy = brush_height;
 
+      boolean use_em_engine = TRUE;
+      boolean use_sp_engine = TRUE;
+      boolean use_mm_engine = TRUE;
+
+      for (x = 0; x < MAX_LEV_FIELDX; x++)
+      {
+	for (y = 0; y < MAX_LEV_FIELDY; y++)
+	{
+	  int element = Tile[x][y];
+
+	  if (!IS_EM_ELEMENT(element) && !ELEM_IS_PLAYER(element))
+	    use_em_engine = FALSE;
+
+	  if (!IS_SP_ELEMENT(element))
+	    use_sp_engine = FALSE;
+
+	  if (!IS_MM_ELEMENT(element) && element != EL_EMPTY)
+	    use_mm_engine = FALSE;
+	}
+      }
+
+      level.game_engine_type = (use_em_engine ? GAME_ENGINE_TYPE_EM :
+				use_sp_engine ? GAME_ENGINE_TYPE_SP :
+				use_mm_engine ? GAME_ENGINE_TYPE_MM :
+				GAME_ENGINE_TYPE_RND);
+
+      // update element selection list
+      ReinitializeElementList();
+      ModifyEditorElementList();
+
       SetBorderElement();
 
       DrawEditModeWindow();
@@ -13773,7 +13806,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       }
       else
       {
-	ChangeEditModeWindow(last_edit_mode);
+	ChangeEditModeWindow(ED_MODE_DRAWING);
 
 	ClickOnGadget(level_editor_gadget[last_level_drawing_function],
 		      MB_LEFTBUTTON);
@@ -13938,7 +13971,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       }
       else
       {
-	ChangeEditModeWindow(last_edit_mode);
+	ChangeEditModeWindow(ED_MODE_DRAWING);
       }
       break;