X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=17677e8dec42d4520c39a2d481f87a50c5f0f030;hb=1256664ceac31f448a0139edd3bd0dc8fa5a8697;hp=871eafa8aed419c25c41fcdbaf4e74d0d1c3fd40;hpb=a5a03e15b395ba1942c180d1cd0d3a4f43b87f56;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index 871eafa8..17677e8d 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -112,7 +112,7 @@ int editor_element[] =
   EL_MAMPFER,
   EL_KAEFER_O,
   EL_FLIEGER_O,
-  EL_ZOMBIE,
+  EL_ROBOT,
 
   EL_KAEFER_L,
   EL_FLIEGER_L,
@@ -159,6 +159,11 @@ int editor_element[] =
   EL_CHAR_A + ('R' - 'A'),
   EL_CHAR_A + ('E' - 'A'),
 
+  EL_PFEIL_L,
+  EL_PFEIL_R,
+  EL_PFEIL_O,
+  EL_PFEIL_U,
+
   EL_AMOEBE_VOLL,
   EL_EDELSTEIN_GELB,
   EL_EDELSTEIN_ROT,
@@ -189,6 +194,16 @@ int editor_element[] =
   EL_DYNABOMB_XL,
   EL_BADEWANNE,
 
+  EL_MAULWURF,
+  EL_PINGUIN,
+  EL_SCHWEIN,
+  EL_DRACHE,
+
+  EL_SONDE,
+  EL_LEERRAUM,
+  EL_LEERRAUM,
+  EL_LEERRAUM,
+
   EL_CHAR_A + ('S' - 'A'),
   EL_CHAR_A + ('O' - 'A'),
   EL_CHAR_A + ('K' - 'A'),
@@ -221,6 +236,11 @@ int editor_element[] =
   EL_CHAR_A + ('R' - 'A'),
 */
 
+  EL_LEERRAUM,
+  EL_LEERRAUM,
+  EL_LEERRAUM,
+  EL_LEERRAUM,
+
   EL_CHAR_AUSRUF,
   EL_CHAR_ZOLL,
   EL_CHAR_DOLLAR,
@@ -330,26 +350,26 @@ void DrawLevelEd()
     else
       graphic = GFX_LEERRAUM;
 
-    DrawMiniGraphicExtHiRes(pix[PIX_DB_DOOR],gc,
-			    DOOR_GFX_PAGEX1+ED_BUTTON_ELEM_XPOS+3 + 
-			    (i%MAX_ELEM_X)*ED_BUTTON_ELEM_XSIZE,
-			    DOOR_GFX_PAGEY1+ED_BUTTON_ELEM_YPOS+3 +
-			    (i/MAX_ELEM_X)*ED_BUTTON_ELEM_YSIZE,
-			    graphic);
+    DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
+		       DOOR_GFX_PAGEX1+ED_BUTTON_ELEM_XPOS+3 + 
+		       (i%MAX_ELEM_X)*ED_BUTTON_ELEM_XSIZE,
+		       DOOR_GFX_PAGEY1+ED_BUTTON_ELEM_YPOS+3 +
+		       (i/MAX_ELEM_X)*ED_BUTTON_ELEM_YSIZE,
+		       graphic);
   }
 
-  DrawMiniGraphicExtHiRes(pix[PIX_DB_DOOR],gc,
-			  DOOR_GFX_PAGEX1+ED_WIN_MB_LEFT_XPOS,
-			  DOOR_GFX_PAGEY1+ED_WIN_MB_LEFT_YPOS,
-			  el2gfx(new_element1));
-  DrawMiniGraphicExtHiRes(pix[PIX_DB_DOOR],gc,
-			  DOOR_GFX_PAGEX1+ED_WIN_MB_MIDDLE_XPOS,
-			  DOOR_GFX_PAGEY1+ED_WIN_MB_MIDDLE_YPOS,
-			  el2gfx(new_element2));
-  DrawMiniGraphicExtHiRes(pix[PIX_DB_DOOR],gc,
-			  DOOR_GFX_PAGEX1+ED_WIN_MB_RIGHT_XPOS,
-			  DOOR_GFX_PAGEY1+ED_WIN_MB_RIGHT_YPOS,
-			  el2gfx(new_element3));
+  DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
+		     DOOR_GFX_PAGEX1+ED_WIN_MB_LEFT_XPOS,
+		     DOOR_GFX_PAGEY1+ED_WIN_MB_LEFT_YPOS,
+		     el2gfx(new_element1));
+  DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
+		     DOOR_GFX_PAGEX1+ED_WIN_MB_MIDDLE_XPOS,
+		     DOOR_GFX_PAGEY1+ED_WIN_MB_MIDDLE_YPOS,
+		     el2gfx(new_element2));
+  DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
+		     DOOR_GFX_PAGEX1+ED_WIN_MB_RIGHT_XPOS,
+		     DOOR_GFX_PAGEY1+ED_WIN_MB_RIGHT_YPOS,
+		     el2gfx(new_element3));
   DrawTextExt(pix[PIX_DB_DOOR],gc,
 	      DOOR_GFX_PAGEX2+ED_WIN_LEVELNR_XPOS,
 	      DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS,
@@ -689,18 +709,18 @@ void LevelEd(int mx, int my, int button)
       else if (last_button==3)
 	new_element3 = new_element;
 
-      DrawMiniGraphicExtHiRes(drawto,gc,
-			      DX+ED_WIN_MB_LEFT_XPOS,
-			      DY+ED_WIN_MB_LEFT_YPOS,
-			      el2gfx(new_element1));
-      DrawMiniGraphicExtHiRes(drawto,gc,
-			      DX+ED_WIN_MB_MIDDLE_XPOS,
-			      DY+ED_WIN_MB_MIDDLE_YPOS,
-			      el2gfx(new_element2));
-      DrawMiniGraphicExtHiRes(drawto,gc,
-			      DX+ED_WIN_MB_RIGHT_XPOS,
-			      DY+ED_WIN_MB_RIGHT_YPOS,
-			      el2gfx(new_element3));
+      DrawMiniGraphicExt(drawto,gc,
+			 DX+ED_WIN_MB_LEFT_XPOS,
+			 DY+ED_WIN_MB_LEFT_YPOS,
+			 el2gfx(new_element1));
+      DrawMiniGraphicExt(drawto,gc,
+			 DX+ED_WIN_MB_MIDDLE_XPOS,
+			 DY+ED_WIN_MB_MIDDLE_YPOS,
+			 el2gfx(new_element2));
+      DrawMiniGraphicExt(drawto,gc,
+			 DX+ED_WIN_MB_RIGHT_XPOS,
+			 DY+ED_WIN_MB_RIGHT_YPOS,
+			 el2gfx(new_element3));
       redraw_mask |= REDRAW_DOOR_1;
     }
   
@@ -1188,7 +1208,7 @@ void LevelNameTyping(KeySym key)
 		ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
 		"<",FS_SMALL,FC_RED);
   }
-  else if (key==XK_Delete && len>0)
+  else if ((key==XK_Delete || key==XK_BackSpace) && len>0)
   {
     level.name[len-1] = 0;
     len--;