X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_esg.c;h=12aec7994b2ae5afb03f5612f9b0e0d4518c116e;hb=a1953c53a88ae0b5a84190c1d66eba9aaf8e8538;hp=83ddda904ad4454547a4642f73748588c46781ce;hpb=0548cd8fd0353c19608df8a7079fc2c39cc4ce27;p=rocksndiamonds.git

diff --git a/src/conf_esg.c b/src/conf_esg.c
index 83ddda90..12aec799 100644
--- a/src/conf_esg.c
+++ b/src/conf_esg.c
@@ -20,10 +20,10 @@
 
 static struct
 {
-    int element;
-    int special;
+  int element;
+  int special;
 
-    int graphic;
+  int graphic;
 }
 element_to_special_graphic[] =
 {
@@ -80,20 +80,20 @@ element_to_special_graphic[] =
     IMG_AMOEBA_DEAD_EDITOR
   },
   {
-    EL_EM_GATE1_GRAY,				GFX_SPECIAL_ARG_EDITOR,
-    IMG_EM_GATE1_GRAY_EDITOR
+    EL_EM_GATE_1_GRAY,				GFX_SPECIAL_ARG_EDITOR,
+    IMG_EM_GATE_1_GRAY_EDITOR
   },
   {
-    EL_EM_GATE2_GRAY,				GFX_SPECIAL_ARG_EDITOR,
-    IMG_EM_GATE2_GRAY_EDITOR
+    EL_EM_GATE_2_GRAY,				GFX_SPECIAL_ARG_EDITOR,
+    IMG_EM_GATE_2_GRAY_EDITOR
   },
   {
-    EL_EM_GATE3_GRAY,				GFX_SPECIAL_ARG_EDITOR,
-    IMG_EM_GATE3_GRAY_EDITOR
+    EL_EM_GATE_3_GRAY,				GFX_SPECIAL_ARG_EDITOR,
+    IMG_EM_GATE_3_GRAY_EDITOR
   },
   {
-    EL_EM_GATE4_GRAY,				GFX_SPECIAL_ARG_EDITOR,
-    IMG_EM_GATE4_GRAY_EDITOR
+    EL_EM_GATE_4_GRAY,				GFX_SPECIAL_ARG_EDITOR,
+    IMG_EM_GATE_4_GRAY_EDITOR
   },
   {
     EL_INVISIBLE_STEELWALL,			GFX_SPECIAL_ARG_EDITOR,
@@ -108,72 +108,72 @@ element_to_special_graphic[] =
     IMG_INVISIBLE_SAND_EDITOR
   },
   {
-    EL_KEY1,					GFX_SPECIAL_ARG_EDITOR,
-    IMG_KEY1_EDITOR
+    EL_KEY_1,					GFX_SPECIAL_ARG_EDITOR,
+    IMG_KEY_1_EDITOR
   },
   {
-    EL_KEY2,					GFX_SPECIAL_ARG_EDITOR,
-    IMG_KEY2_EDITOR
+    EL_KEY_2,					GFX_SPECIAL_ARG_EDITOR,
+    IMG_KEY_2_EDITOR
   },
   {
-    EL_KEY3,					GFX_SPECIAL_ARG_EDITOR,
-    IMG_KEY3_EDITOR
+    EL_KEY_3,					GFX_SPECIAL_ARG_EDITOR,
+    IMG_KEY_3_EDITOR
   },
   {
-    EL_KEY4,					GFX_SPECIAL_ARG_EDITOR,
-    IMG_KEY4_EDITOR
+    EL_KEY_4,					GFX_SPECIAL_ARG_EDITOR,
+    IMG_KEY_4_EDITOR
   },
   {
-    EL_GATE1_GRAY,				GFX_SPECIAL_ARG_EDITOR,
-    IMG_GATE1_GRAY_EDITOR
+    EL_GATE_1_GRAY,				GFX_SPECIAL_ARG_EDITOR,
+    IMG_GATE_1_GRAY_EDITOR
   },
   {
-    EL_GATE2_GRAY,				GFX_SPECIAL_ARG_EDITOR,
-    IMG_GATE2_GRAY_EDITOR
+    EL_GATE_2_GRAY,				GFX_SPECIAL_ARG_EDITOR,
+    IMG_GATE_2_GRAY_EDITOR
   },
   {
-    EL_GATE3_GRAY,				GFX_SPECIAL_ARG_EDITOR,
-    IMG_GATE3_GRAY_EDITOR
+    EL_GATE_3_GRAY,				GFX_SPECIAL_ARG_EDITOR,
+    IMG_GATE_3_GRAY_EDITOR
   },
   {
-    EL_GATE4_GRAY,				GFX_SPECIAL_ARG_EDITOR,
-    IMG_GATE4_GRAY_EDITOR
+    EL_GATE_4_GRAY,				GFX_SPECIAL_ARG_EDITOR,
+    IMG_GATE_4_GRAY_EDITOR
   },
   {
     EL_LAMP,					GFX_SPECIAL_ARG_EDITOR,
     IMG_LAMP_EDITOR
   },
   {
-    EL_WALL_GROWING_XY,				GFX_SPECIAL_ARG_EDITOR,
-    IMG_WALL_GROWING_XY_EDITOR
+    EL_EXPANDABLE_WALL_HORIZONTAL,		GFX_SPECIAL_ARG_EDITOR,
+    IMG_EXPANDABLE_WALL_HORIZONTAL_EDITOR
   },
   {
-    EL_WALL_GROWING_X,				GFX_SPECIAL_ARG_EDITOR,
-    IMG_WALL_GROWING_X_EDITOR
+    EL_EXPANDABLE_WALL_VERTICAL,		GFX_SPECIAL_ARG_EDITOR,
+    IMG_EXPANDABLE_WALL_VERTICAL_EDITOR
   },
   {
-    EL_WALL_GROWING_Y,				GFX_SPECIAL_ARG_EDITOR,
-    IMG_WALL_GROWING_Y_EDITOR
+    EL_EXPANDABLE_WALL_ANY,			GFX_SPECIAL_ARG_EDITOR,
+    IMG_EXPANDABLE_WALL_ANY_EDITOR
   },
   {
     EL_PENGUIN,					GFX_SPECIAL_ARG_EDITOR,
     IMG_PENGUIN_EDITOR
   },
   {
-    EL_PLAYER1,					GFX_SPECIAL_ARG_EDITOR,
-    IMG_PLAYER1_EDITOR
+    EL_PLAYER_1,				GFX_SPECIAL_ARG_EDITOR,
+    IMG_PLAYER_1_EDITOR
   },
   {
-    EL_PLAYER2,					GFX_SPECIAL_ARG_EDITOR,
-    IMG_PLAYER2_EDITOR
+    EL_PLAYER_2,				GFX_SPECIAL_ARG_EDITOR,
+    IMG_PLAYER_2_EDITOR
   },
   {
-    EL_PLAYER3,					GFX_SPECIAL_ARG_EDITOR,
-    IMG_PLAYER3_EDITOR
+    EL_PLAYER_3,				GFX_SPECIAL_ARG_EDITOR,
+    IMG_PLAYER_3_EDITOR
   },
   {
-    EL_PLAYER4,					GFX_SPECIAL_ARG_EDITOR,
-    IMG_PLAYER4_EDITOR
+    EL_PLAYER_4,				GFX_SPECIAL_ARG_EDITOR,
+    IMG_PLAYER_4_EDITOR
   },
   {
     EL_STEELWALL_TOPLEFT,			GFX_SPECIAL_ARG_EDITOR,