X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=7b066ee9741e44497b7fac6f37b3e4f959f30717;hb=234748b5eb0bc4fe29a36fd25a1d25658f53858a;hp=922dfe0699deaf9c27600642299f01c2b3531cc1;hpb=1d7b4b0ee6ba41cb6f977d35aca97e4965560cd4;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index 922dfe06..7b066ee9 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -754,29 +754,29 @@ int editor_element[] =
   EL_CHAR('S'),
   EL_CHAR('H'),
 
-  EL_PLAYER,
+  EL_PLAYER1,
   EL_EMPTY,
   EL_SAND,
   EL_STEELWALL,
 
   EL_BD_WALL,
-  EL_MAGIC_WALL_BD_OFF,
+  EL_BD_MAGIC_WALL,
   EL_EXIT_CLOSED,
   EL_EXIT_OPEN,
 
   EL_BD_DIAMOND,
-  EL_BUTTERFLY_UP,
-  EL_FIREFLY_UP,
+  EL_BD_BUTTERFLY_UP,
+  EL_BD_FIREFLY_UP,
   EL_BD_ROCK,
 
-  EL_BUTTERFLY_LEFT,
-  EL_FIREFLY_LEFT,
-  EL_BUTTERFLY_RIGHT,
-  EL_FIREFLY_RIGHT,
+  EL_BD_BUTTERFLY_LEFT,
+  EL_BD_FIREFLY_LEFT,
+  EL_BD_BUTTERFLY_RIGHT,
+  EL_BD_FIREFLY_RIGHT,
 
   EL_BD_AMOEBA,
-  EL_BUTTERFLY_DOWN,
-  EL_FIREFLY_DOWN,
+  EL_BD_BUTTERFLY_DOWN,
+  EL_BD_FIREFLY_DOWN,
   EL_EMPTY,
 
   EL_CHAR('E'),
@@ -799,7 +799,7 @@ int editor_element[] =
   EL_PLAYER3,
   EL_PLAYER4,
 
-  EL_PLAYER,
+  EL_PLAYER1,
   EL_EMPTY,
   EL_SAND,
   EL_ROCK,
@@ -889,10 +889,10 @@ int editor_element[] =
   EL_GATE3_GRAY,
   EL_GATE4_GRAY,
 
-  EL_ARROW_LEFT,
-  EL_ARROW_RIGHT,
-  EL_ARROW_UP,
-  EL_ARROW_DOWN,
+  EL_ARROW_BLUE_LEFT,
+  EL_ARROW_BLUE_RIGHT,
+  EL_ARROW_BLUE_UP,
+  EL_ARROW_BLUE_DOWN,
 
   EL_AMOEBA_FULL,
   EL_EMERALD_YELLOW,
@@ -942,7 +942,7 @@ int editor_element[] =
   EL_EMPTY,
   EL_MOLE_DOWN,
   EL_BALLOON,
-  EL_BALLOON_SEND_ANY,
+  EL_BALLOON_SEND_ANY_DIRECTION,
 
   EL_BALLOON_SEND_LEFT,
   EL_BALLOON_SEND_RIGHT,
@@ -980,9 +980,9 @@ int editor_element[] =
   EL_CHAR('A'),
   EL_CHAR('N'),
 
-  EL_SOKOBAN_OBJEKT,
-  EL_SOKOBAN_FELD_LEER,
-  EL_SOKOBAN_FELD_VOLL,
+  EL_SOKOBAN_OBJECT,
+  EL_SOKOBAN_FIELD_EMPTY,
+  EL_SOKOBAN_FIELD_FULL,
   EL_STEELWALL,
 
   EL_CHAR('S'),
@@ -1026,7 +1026,7 @@ int editor_element[] =
   EL_SP_PORT_XY,
 
   EL_SP_ELECTRON,
-  EL_SP_BUG,
+  EL_SP_BUGGY_BASE,
   EL_SP_CHIP_LEFT,
   EL_SP_CHIP_RIGHT,
 
@@ -1107,11 +1107,11 @@ int editor_element[] =
 
   EL_TIMEGATE_CLOSED,
   EL_TIMEGATE_OPEN,
-  EL_TIMEGATE_SWITCH_OFF,
+  EL_TIMEGATE_SWITCH,
   EL_EMPTY,
 
   EL_LANDMINE,
-  EL_SAND_INVISIBLE,
+  EL_INVISIBLE_SAND,
   EL_STEELWALL_SLANTED,
   EL_EMPTY,
 
@@ -1121,7 +1121,7 @@ int editor_element[] =
   EL_LIGHT_SWITCH_ACTIVE,
 
   EL_SHIELD_NORMAL,
-  EL_SHIELD_ACTIVE,
+  EL_SHIELD_DEADLY,
   EL_EXTRA_TIME,
   EL_EMPTY,
 
@@ -1147,20 +1147,20 @@ int editor_element[] =
 
   EL_SPRING,
   EL_TUBE_RIGHT_DOWN,
-  EL_TUBE_HORIZ_DOWN,
+  EL_TUBE_HORIZONTAL_DOWN,
   EL_TUBE_LEFT_DOWN,
 
   EL_TUBE_HORIZONTAL,
-  EL_TUBE_VERT_RIGHT,
-  EL_TUBE_CROSS,
-  EL_TUBE_VERT_LEFT,
+  EL_TUBE_VERTICAL_RIGHT,
+  EL_TUBE_ALL,
+  EL_TUBE_VERTICAL_LEFT,
 
   EL_TUBE_VERTICAL,
   EL_TUBE_RIGHT_UP,
-  EL_TUBE_HORIZ_UP,
+  EL_TUBE_HORIZONTAL_UP,
   EL_TUBE_LEFT_UP,
 
-  EL_TRAP_INACTIVE,
+  EL_TRAP,
   EL_DX_SUPABOMB,
   EL_EMPTY,
   EL_EMPTY,
@@ -1490,7 +1490,7 @@ static void CreateControlButtons()
     gd_x2 = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS;
     gd_y  = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_YPOS;
 
-    getMiniGraphicSource(el2gfx(editor_element[i]),
+    getMiniGraphicSource(el2img(editor_element[i]),
 			 &deco_bitmap, &deco_x, &deco_y);
     deco_xpos = (ED_ELEMENTLIST_XSIZE - MINI_TILEX) / 2;
     deco_ypos = (ED_ELEMENTLIST_YSIZE - MINI_TILEY) / 2;
@@ -2101,8 +2101,7 @@ static boolean LevelContainsPlayer()
 
   for(y=0; y<lev_fieldy; y++) 
     for(x=0; x<lev_fieldx; x++)
-      if (Feld[x][y] == EL_PLAYER ||
-	  Feld[x][y] == EL_PLAYER1 ||
+      if (Feld[x][y] == EL_PLAYER1 ||
 	  Feld[x][y] == EL_SP_MURPHY) 
 	player_found = TRUE;
 
@@ -2144,13 +2143,13 @@ void DrawLevelEd()
   /* draw mouse button brush elements */
   DrawMiniGraphicExt(drawto,
 		     DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
-		     el2gfx(new_element1));
+		     el2img(new_element1));
   DrawMiniGraphicExt(drawto,
 		     DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
-		     el2gfx(new_element2));
+		     el2img(new_element2));
   DrawMiniGraphicExt(drawto,
 		     DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
-		     el2gfx(new_element3));
+		     el2img(new_element3));
 
   /* draw bigger door */
   DrawSpecialEditorDoor();
@@ -2323,21 +2322,21 @@ static void PickDrawingElement(int button, int element)
     new_element1 = element;
     DrawMiniGraphicExt(drawto,
 		       DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
-		       el2gfx(new_element1));
+		       el2img(new_element1));
   }
   else if (button == 2)
   {
     new_element2 = element;
     DrawMiniGraphicExt(drawto,
 		       DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
-		       el2gfx(new_element2));
+		       el2img(new_element2));
   }
   else
   {
     new_element3 = element;
     DrawMiniGraphicExt(drawto,
 		       DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
-		       el2gfx(new_element3));
+		       el2img(new_element3));
   }
 
   redraw_mask |= REDRAW_DOOR_1;
@@ -2620,18 +2619,18 @@ static void DrawPropertiesWindow()
     { EL_BUG_UP,	&level.score[SC_KAEFER],	TEXT_SMASHING },
     { EL_BUG_LEFT,	&level.score[SC_KAEFER],	TEXT_SMASHING },
     { EL_BUG_DOWN,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BUTTERFLY_RIGHT,&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BUTTERFLY_UP,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BUTTERFLY_LEFT,&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BUTTERFLY_DOWN,&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BD_BUTTERFLY_RIGHT,&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BD_BUTTERFLY_UP,   &level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BD_BUTTERFLY_LEFT, &level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BD_BUTTERFLY_DOWN, &level.score[SC_KAEFER],	TEXT_SMASHING },
     { EL_SPACESHIP_RIGHT,&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_SPACESHIP_UP,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_SPACESHIP_LEFT,&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_SPACESHIP_DOWN,&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FIREFLY_RIGHT,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FIREFLY_UP,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FIREFLY_LEFT,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FIREFLY_DOWN,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_SPACESHIP_UP,	 &level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_SPACESHIP_LEFT, &level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_SPACESHIP_DOWN, &level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_BD_FIREFLY_RIGHT,&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_BD_FIREFLY_UP,	  &level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_BD_FIREFLY_LEFT, &level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_BD_FIREFLY_DOWN, &level.score[SC_FLIEGER],	TEXT_SMASHING },
     { EL_YAMYAM,	&level.score[SC_MAMPFER],	TEXT_SMASHING },
     { EL_DARK_YAMYAM,	&level.score[SC_MAMPFER],	TEXT_SMASHING },
     { EL_ROBOT,		&level.score[SC_ROBOT],		TEXT_SMASHING },
@@ -2682,7 +2681,7 @@ static void DrawPropertiesWindow()
 	     SX + xstart * MINI_TILEX - MINI_TILEX/2,
 	     SY + ystart * MINI_TILEY - MINI_TILEY/2);
 
-  DrawGraphic(xstart/2, ystart/2, el2gfx(properties_element));
+  DrawGraphic(xstart / 2, ystart / 2, el2img(properties_element), 0);
 
   /* copy the whole stuff to the definitive location */
   BlitBitmap(drawto, drawto,
@@ -3447,14 +3446,14 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 	}
 	else if (new_element != Feld[lx][ly])
 	{
-	  if (new_element == EL_PLAYER)
+	  if (new_element == EL_PLAYER1)
 	  {
 	    /* remove player at old position */
 	    for(y=0; y<lev_fieldy; y++)
 	    {
 	      for(x=0; x<lev_fieldx; x++)
 	      {
-		if (Feld[x][y] == EL_PLAYER || Feld[x][y] == EL_PLAYER1)
+		if (Feld[x][y] == EL_PLAYER1)
 		{
 		  Feld[x][y] = EL_EMPTY;
 		  if (x - level_xpos >= 0 && x - level_xpos < ed_fieldx &&
@@ -3475,11 +3474,11 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 	DrawMiniGraphicExt(drawto,
 			   gi->x + sx * MINI_TILEX,
 			   gi->y + sy * MINI_TILEY,
-			   el2gfx(new_element));
+			   el2img(new_element));
 	DrawMiniGraphicExt(window,
 			   gi->x + sx * MINI_TILEX,
 			   gi->y + sy * MINI_TILEY,
-			   el2gfx(new_element));
+			   el2img(new_element));
 
 	if (id == GADGET_ID_AMOEBA_CONTENT)
 	  level.amoeba_content = new_element;
@@ -3801,7 +3800,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	int element = editor_element[element_shift + i];
 
 	UnmapGadget(gi);
-	getMiniGraphicSource(el2gfx(element), &gd->bitmap, &gd->x, &gd->y);
+	getMiniGraphicSource(el2img(element), &gd->bitmap, &gd->x, &gd->y);
 	ModifyGadget(gi, GDI_INFO_TEXT, getElementInfoText(element), GDI_END);
 	MapGadget(gi);
       }