X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2g.c;h=ca1c90513c53ee8444944965a9a70d2165b0254a;hb=cb8b58732432cc7f3163446dedd54c63126b23c3;hp=3a98861ab8e51b12e257f8ef4940da8ee4cbfd0b;hpb=000f4fbffe0d915d1ded9c981a5a2d521cdf7e5e;p=rocksndiamonds.git

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index 3a98861a..ca1c9051 100644
--- a/src/conf_e2g.c
+++ b/src/conf_e2g.c
@@ -1001,6 +1001,42 @@ element_to_graphic[] =
     EL_MAGIC_WALL_DEAD,			-1, -1, FALSE,
     IMG_MAGIC_WALL_DEAD
   },
+  {
+    EL_DC_MAGIC_WALL,			-1, -1, FALSE,
+    IMG_DC_MAGIC_WALL
+  },
+  {
+    EL_DC_MAGIC_WALL_ACTIVE,		-1, -1, FALSE,
+    IMG_DC_MAGIC_WALL_ACTIVE
+  },
+  {
+    EL_DC_MAGIC_WALL,			ACTION_ACTIVE, -1, FALSE,
+    IMG_DC_MAGIC_WALL_ACTIVE
+  },
+  {
+    EL_DC_MAGIC_WALL_FILLING,		-1, -1, FALSE,
+    IMG_DC_MAGIC_WALL_FILLING
+  },
+  {
+    EL_DC_MAGIC_WALL,			ACTION_FILLING, -1, FALSE,
+    IMG_DC_MAGIC_WALL_FILLING
+  },
+  {
+    EL_DC_MAGIC_WALL_FULL,		-1, -1, FALSE,
+    IMG_DC_MAGIC_WALL_FULL
+  },
+  {
+    EL_DC_MAGIC_WALL_EMPTYING,		-1, -1, FALSE,
+    IMG_DC_MAGIC_WALL_EMPTYING
+  },
+  {
+    EL_DC_MAGIC_WALL,			ACTION_EMPTYING, -1, FALSE,
+    IMG_DC_MAGIC_WALL_EMPTYING
+  },
+  {
+    EL_DC_MAGIC_WALL_DEAD,		-1, -1, FALSE,
+    IMG_DC_MAGIC_WALL_DEAD
+  },
   {
     EL_QUICKSAND_EMPTY,			-1, -1, FALSE,
     IMG_QUICKSAND_EMPTY
@@ -1017,6 +1053,22 @@ element_to_graphic[] =
     EL_QUICKSAND_EMPTYING,		-1, -1, FALSE,
     IMG_QUICKSAND_EMPTYING
   },
+  {
+    EL_QUICKSAND_FAST_EMPTY,		-1, -1, FALSE,
+    IMG_QUICKSAND_FAST_EMPTY
+  },
+  {
+    EL_QUICKSAND_FAST_FILLING,		-1, -1, FALSE,
+    IMG_QUICKSAND_FAST_FILLING
+  },
+  {
+    EL_QUICKSAND_FAST_FULL,		-1, -1, FALSE,
+    IMG_QUICKSAND_FAST_FULL
+  },
+  {
+    EL_QUICKSAND_FAST_EMPTYING,		-1, -1, FALSE,
+    IMG_QUICKSAND_FAST_EMPTYING
+  },
   {
     EL_ACID_POOL_TOPLEFT,		-1, -1, FALSE,
     IMG_ACID_POOL_TOPLEFT
@@ -1109,6 +1161,10 @@ element_to_graphic[] =
     EL_EM_KEY_4,			-1, -1, FALSE,
     IMG_EM_KEY_4
   },
+  {
+    EL_DC_KEY_WHITE,			-1, -1, FALSE,
+    IMG_DC_KEY_WHITE
+  },
   {
     EL_EM_GATE_1,			-1, -1, FALSE,
     IMG_EM_GATE_1
@@ -1125,6 +1181,10 @@ element_to_graphic[] =
     EL_EM_GATE_4,			-1, -1, FALSE,
     IMG_EM_GATE_4
   },
+  {
+    EL_DC_GATE_WHITE,			-1, -1, FALSE,
+    IMG_DC_GATE_WHITE
+  },
   {
     EL_EM_GATE_1_GRAY,			-1, -1, FALSE,
     IMG_EM_GATE_1_GRAY
@@ -1173,6 +1233,22 @@ element_to_graphic[] =
     EL_EM_GATE_4_GRAY,			ACTION_ACTIVE, -1, FALSE,
     IMG_EM_GATE_4_GRAY_ACTIVE
   },
+  {
+    EL_DC_GATE_WHITE_GRAY,		-1, -1, FALSE,
+    IMG_DC_GATE_WHITE_GRAY
+  },
+  {
+    EL_DC_GATE_WHITE_GRAY_ACTIVE,	-1, -1, FALSE,
+    IMG_DC_GATE_WHITE_GRAY_ACTIVE
+  },
+  {
+    EL_DC_GATE_WHITE_GRAY,		ACTION_ACTIVE, -1, FALSE,
+    IMG_DC_GATE_WHITE_GRAY_ACTIVE
+  },
+  {
+    EL_DC_GATE_FAKE_GRAY,		-1, -1, FALSE,
+    IMG_DC_GATE_FAKE_GRAY
+  },
   {
     EL_EXIT_CLOSED,			-1, -1, FALSE,
     IMG_EXIT_CLOSED
@@ -1205,6 +1281,38 @@ element_to_graphic[] =
     EL_STEEL_EXIT_CLOSING,		-1, -1, FALSE,
     IMG_STEEL_EXIT_CLOSING
   },
+  {
+    EL_EM_EXIT_CLOSED,			-1, -1, FALSE,
+    IMG_EM_EXIT_CLOSED
+  },
+  {
+    EL_EM_EXIT_OPENING,			-1, -1, FALSE,
+    IMG_EM_EXIT_OPENING
+  },
+  {
+    EL_EM_EXIT_OPEN,			-1, -1, FALSE,
+    IMG_EM_EXIT_OPEN
+  },
+  {
+    EL_EM_EXIT_CLOSING,			-1, -1, FALSE,
+    IMG_EM_EXIT_CLOSING
+  },
+  {
+    EL_EM_STEEL_EXIT_CLOSED,		-1, -1, FALSE,
+    IMG_EM_STEEL_EXIT_CLOSED
+  },
+  {
+    EL_EM_STEEL_EXIT_OPENING,		-1, -1, FALSE,
+    IMG_EM_STEEL_EXIT_OPENING
+  },
+  {
+    EL_EM_STEEL_EXIT_OPEN,		-1, -1, FALSE,
+    IMG_EM_STEEL_EXIT_OPEN
+  },
+  {
+    EL_EM_STEEL_EXIT_CLOSING,		-1, -1, FALSE,
+    IMG_EM_STEEL_EXIT_CLOSING
+  },
   {
     EL_BALLOON,				-1, -1, FALSE,
     IMG_BALLOON
@@ -1569,6 +1677,14 @@ element_to_graphic[] =
     EL_SWITCHGATE_SWITCH_DOWN,		-1, -1, FALSE,
     IMG_SWITCHGATE_SWITCH_DOWN
   },
+  {
+    EL_DC_SWITCHGATE_SWITCH_UP,		-1, -1, FALSE,
+    IMG_DC_SWITCHGATE_SWITCH_UP
+  },
+  {
+    EL_DC_SWITCHGATE_SWITCH_DOWN,	-1, -1, FALSE,
+    IMG_DC_SWITCHGATE_SWITCH_DOWN
+  },
   {
     EL_LIGHT_SWITCH,			-1, -1, FALSE,
     IMG_LIGHT_SWITCH
@@ -1593,6 +1709,18 @@ element_to_graphic[] =
     EL_TIMEGATE_SWITCH,			ACTION_ACTIVE, -1, FALSE,
     IMG_TIMEGATE_SWITCH_ACTIVE
   },
+  {
+    EL_DC_TIMEGATE_SWITCH,		-1, -1, FALSE,
+    IMG_DC_TIMEGATE_SWITCH
+  },
+  {
+    EL_DC_TIMEGATE_SWITCH_ACTIVE,	-1, -1, FALSE,
+    IMG_DC_TIMEGATE_SWITCH_ACTIVE
+  },
+  {
+    EL_DC_TIMEGATE_SWITCH,		ACTION_ACTIVE, -1, FALSE,
+    IMG_DC_TIMEGATE_SWITCH_ACTIVE
+  },
   {
     EL_ENVELOPE_1,			-1, -1, FALSE,
     IMG_ENVELOPE_1
@@ -1709,6 +1837,10 @@ element_to_graphic[] =
     EL_LANDMINE,			-1, -1, FALSE,
     IMG_LANDMINE
   },
+  {
+    EL_DC_LANDMINE,			-1, -1, FALSE,
+    IMG_DC_LANDMINE
+  },
   {
     EL_STEELWALL_SLIPPERY,		-1, -1, FALSE,
     IMG_STEELWALL_SLIPPERY
@@ -2173,6 +2305,18 @@ element_to_graphic[] =
     EL_EXPANDABLE_WALL_ANY,		-1, -1, FALSE,
     IMG_EXPANDABLE_WALL_ANY
   },
+  {
+    EL_EXPANDABLE_STEELWALL_HORIZONTAL,	-1, -1, FALSE,
+    IMG_EXPANDABLE_STEELWALL_HORIZONTAL
+  },
+  {
+    EL_EXPANDABLE_STEELWALL_VERTICAL,	-1, -1, FALSE,
+    IMG_EXPANDABLE_STEELWALL_VERTICAL
+  },
+  {
+    EL_EXPANDABLE_STEELWALL_ANY,	-1, -1, FALSE,
+    IMG_EXPANDABLE_STEELWALL_ANY
+  },
   {
     EL_BD_EXPANDABLE_WALL,		-1, -1, FALSE,
     IMG_BD_EXPANDABLE_WALL
@@ -2209,6 +2353,38 @@ element_to_graphic[] =
     EL_EXPANDABLE_WALL_GROWING,		-1, MV_BIT_DOWN, FALSE,
     IMG_EXPANDABLE_WALL_GROWING_DOWN
   },
+  {
+    EL_EXPANDABLE_STEELWALL,		ACTION_GROWING, MV_BIT_LEFT, FALSE,
+    IMG_EXPANDABLE_STEELWALL_GROWING_LEFT
+  },
+  {
+    EL_EXPANDABLE_STEELWALL_GROWING,	-1, MV_BIT_LEFT, FALSE,
+    IMG_EXPANDABLE_STEELWALL_GROWING_LEFT
+  },
+  {
+    EL_EXPANDABLE_STEELWALL,		ACTION_GROWING, MV_BIT_RIGHT, FALSE,
+    IMG_EXPANDABLE_STEELWALL_GROWING_RIGHT
+  },
+  {
+    EL_EXPANDABLE_STEELWALL_GROWING,	-1, MV_BIT_RIGHT, FALSE,
+    IMG_EXPANDABLE_STEELWALL_GROWING_RIGHT
+  },
+  {
+    EL_EXPANDABLE_STEELWALL,		ACTION_GROWING, MV_BIT_UP, FALSE,
+    IMG_EXPANDABLE_STEELWALL_GROWING_UP
+  },
+  {
+    EL_EXPANDABLE_STEELWALL_GROWING,	-1, MV_BIT_UP, FALSE,
+    IMG_EXPANDABLE_STEELWALL_GROWING_UP
+  },
+  {
+    EL_EXPANDABLE_STEELWALL,		ACTION_GROWING, MV_BIT_DOWN, FALSE,
+    IMG_EXPANDABLE_STEELWALL_GROWING_DOWN
+  },
+  {
+    EL_EXPANDABLE_STEELWALL_GROWING,	-1, MV_BIT_DOWN, FALSE,
+    IMG_EXPANDABLE_STEELWALL_GROWING_DOWN
+  },
   {
     EL_BLACK_ORB,			-1, -1, FALSE,
     IMG_BLACK_ORB
@@ -3409,14 +3585,6 @@ element_to_graphic[] =
     EL_BD_FIREFLY_UP,			-1, -1, FALSE,
     IMG_BD_FIREFLY
   },
-  {
-    EL_DOOR_WHITE,			-1, -1, FALSE,
-    IMG_CHAR_QUESTION
-  },
-  {
-    EL_DOOR_WHITE_GRAY,			-1, -1, FALSE,
-    IMG_CHAR_QUESTION
-  },
   {
     EL_DX_UNKNOWN_15,			-1, -1, FALSE,
     IMG_CHAR_QUESTION
@@ -3425,10 +3593,6 @@ element_to_graphic[] =
     EL_DX_UNKNOWN_42,			-1, -1, FALSE,
     IMG_CHAR_QUESTION
   },
-  {
-    EL_KEY_WHITE,			-1, -1, FALSE,
-    IMG_CHAR_QUESTION
-  },
   {
     EL_SIGN_UNUSED_1,			-1, -1, FALSE,
     IMG_CHAR_QUESTION