X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2g.c;h=34ea8a3f61955f6c32083aeb4726d603892a1358;hb=8a1c6f39577584e0479ed638ed8b3df11d74f561;hp=8e88f2b0807ff1eaaad77fba6902a49f57b7c986;hpb=1ed02c282e3b4bd73c5d26244e4df30d731cc6c8;p=rocksndiamonds.git

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index 8e88f2b0..34ea8a3f 100644
--- a/src/conf_e2g.c
+++ b/src/conf_e2g.c
@@ -109,90 +109,14 @@ element_to_graphic[] =
     EL_BD_BUTTERFLY,			-1, -1, FALSE,
     IMG_BD_BUTTERFLY
   },
-  {
-    EL_BD_BUTTERFLY_RIGHT,		-1, -1, FALSE,
-    IMG_BD_BUTTERFLY_RIGHT
-  },
-  {
-    EL_BD_BUTTERFLY,			-1, MV_BIT_RIGHT, FALSE,
-    IMG_BD_BUTTERFLY_RIGHT
-  },
-  {
-    EL_BD_BUTTERFLY_UP,			-1, -1, FALSE,
-    IMG_BD_BUTTERFLY_UP
-  },
-  {
-    EL_BD_BUTTERFLY,			-1, MV_BIT_UP, FALSE,
-    IMG_BD_BUTTERFLY_UP
-  },
-  {
-    EL_BD_BUTTERFLY_LEFT,		-1, -1, FALSE,
-    IMG_BD_BUTTERFLY_LEFT
-  },
-  {
-    EL_BD_BUTTERFLY,			-1, MV_BIT_LEFT, FALSE,
-    IMG_BD_BUTTERFLY_LEFT
-  },
-  {
-    EL_BD_BUTTERFLY_DOWN,		-1, -1, FALSE,
-    IMG_BD_BUTTERFLY_DOWN
-  },
-  {
-    EL_BD_BUTTERFLY,			-1, MV_BIT_DOWN, FALSE,
-    IMG_BD_BUTTERFLY_DOWN
-  },
-  {
-    EL_BD_BUTTERFLY,			ACTION_MOVING, -1, FALSE,
-    IMG_BD_BUTTERFLY_MOVING
-  },
   {
     EL_BD_FIREFLY,			-1, -1, FALSE,
     IMG_BD_FIREFLY
   },
-  {
-    EL_BD_FIREFLY_RIGHT,		-1, -1, FALSE,
-    IMG_BD_FIREFLY_RIGHT
-  },
-  {
-    EL_BD_FIREFLY,			-1, MV_BIT_RIGHT, FALSE,
-    IMG_BD_FIREFLY_RIGHT
-  },
-  {
-    EL_BD_FIREFLY_UP,			-1, -1, FALSE,
-    IMG_BD_FIREFLY_UP
-  },
-  {
-    EL_BD_FIREFLY,			-1, MV_BIT_UP, FALSE,
-    IMG_BD_FIREFLY_UP
-  },
-  {
-    EL_BD_FIREFLY_LEFT,			-1, -1, FALSE,
-    IMG_BD_FIREFLY_LEFT
-  },
-  {
-    EL_BD_FIREFLY,			-1, MV_BIT_LEFT, FALSE,
-    IMG_BD_FIREFLY_LEFT
-  },
-  {
-    EL_BD_FIREFLY_DOWN,			-1, -1, FALSE,
-    IMG_BD_FIREFLY_DOWN
-  },
-  {
-    EL_BD_FIREFLY,			-1, MV_BIT_DOWN, FALSE,
-    IMG_BD_FIREFLY_DOWN
-  },
-  {
-    EL_BD_FIREFLY,			ACTION_MOVING, -1, FALSE,
-    IMG_BD_FIREFLY_MOVING
-  },
   {
     EL_SP_DEFAULT,			ACTION_EXPLODING, -1, FALSE,
     IMG_SP_DEFAULT_EXPLODING
   },
-  {
-    EL_SP_EMPTY_SPACE,			-1, -1, FALSE,
-    IMG_SP_EMPTY_SPACE
-  },
   {
     EL_SP_ZONK,				-1, -1, FALSE,
     IMG_SP_ZONK
@@ -321,10 +245,18 @@ element_to_graphic[] =
     EL_SP_EXIT_CLOSED,			-1, -1, FALSE,
     IMG_SP_EXIT_CLOSED
   },
+  {
+    EL_SP_EXIT_OPENING,			-1, -1, FALSE,
+    IMG_SP_EXIT_OPENING
+  },
   {
     EL_SP_EXIT_OPEN,			-1, -1, FALSE,
     IMG_SP_EXIT_OPEN
   },
+  {
+    EL_SP_EXIT_CLOSING,			-1, -1, FALSE,
+    IMG_SP_EXIT_CLOSING
+  },
   {
     EL_SP_DISK_ORANGE,			-1, -1, FALSE,
     IMG_SP_DISK_ORANGE
@@ -413,6 +345,38 @@ element_to_graphic[] =
     EL_SP_SNIKSNAK,			-1, MV_BIT_DOWN, FALSE,
     IMG_SP_SNIKSNAK_DOWN
   },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_LEFT, MV_BIT_UP, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_LEFT_UP
+  },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_LEFT, MV_BIT_DOWN, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_LEFT_DOWN
+  },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_RIGHT, MV_BIT_UP, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_RIGHT_UP
+  },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_RIGHT, MV_BIT_DOWN, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_RIGHT_DOWN
+  },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_UP, MV_BIT_LEFT, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_UP_LEFT
+  },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_UP, MV_BIT_RIGHT, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_UP_RIGHT
+  },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_DOWN, MV_BIT_LEFT, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_DOWN_LEFT
+  },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_DOWN, MV_BIT_RIGHT, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_DOWN_RIGHT
+  },
   {
     EL_SP_ELECTRON,			-1, -1, FALSE,
     IMG_SP_ELECTRON
@@ -685,6 +649,38 @@ element_to_graphic[] =
     EL_BUG,				ACTION_MOVING, MV_BIT_DOWN, FALSE,
     IMG_BUG_MOVING_DOWN
   },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_RIGHT, MV_BIT_UP, FALSE,
+    IMG_BUG_TURNING_FROM_RIGHT_UP
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_UP, MV_BIT_LEFT, FALSE,
+    IMG_BUG_TURNING_FROM_UP_LEFT
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_LEFT, MV_BIT_DOWN, FALSE,
+    IMG_BUG_TURNING_FROM_LEFT_DOWN
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_DOWN, MV_BIT_RIGHT, FALSE,
+    IMG_BUG_TURNING_FROM_DOWN_RIGHT
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_RIGHT, MV_BIT_DOWN, FALSE,
+    IMG_BUG_TURNING_FROM_RIGHT_DOWN
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_UP, MV_BIT_RIGHT, FALSE,
+    IMG_BUG_TURNING_FROM_UP_RIGHT
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_LEFT, MV_BIT_UP, FALSE,
+    IMG_BUG_TURNING_FROM_LEFT_UP
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_DOWN, MV_BIT_LEFT, FALSE,
+    IMG_BUG_TURNING_FROM_DOWN_LEFT
+  },
   {
     EL_SPACESHIP,			-1, -1, FALSE,
     IMG_SPACESHIP
@@ -737,6 +733,38 @@ element_to_graphic[] =
     EL_SPACESHIP,			ACTION_MOVING, MV_BIT_DOWN, FALSE,
     IMG_SPACESHIP_MOVING_DOWN
   },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_RIGHT, MV_BIT_UP, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_RIGHT_UP
+  },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_UP, MV_BIT_LEFT, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_UP_LEFT
+  },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_LEFT, MV_BIT_DOWN, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_LEFT_DOWN
+  },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_DOWN, MV_BIT_RIGHT, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_DOWN_RIGHT
+  },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_RIGHT, MV_BIT_DOWN, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_RIGHT_DOWN
+  },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_UP, MV_BIT_RIGHT, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_UP_RIGHT
+  },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_LEFT, MV_BIT_UP, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_LEFT_UP
+  },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_DOWN, MV_BIT_LEFT, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_DOWN_LEFT
+  },
   {
     EL_YAMYAM,				-1, -1, FALSE,
     IMG_YAMYAM
@@ -857,10 +885,18 @@ element_to_graphic[] =
     EL_AMOEBA_GROWING,			-1, -1, FALSE,
     IMG_AMOEBA_GROWING
   },
+  {
+    EL_AMOEBA,				ACTION_GROWING, -1, FALSE,
+    IMG_AMOEBA_GROWING
+  },
   {
     EL_AMOEBA_SHRINKING,		-1, -1, FALSE,
     IMG_AMOEBA_SHRINKING
   },
+  {
+    EL_AMOEBA,				ACTION_SHRINKING, -1, FALSE,
+    IMG_AMOEBA_SHRINKING
+  },
   {
     EL_AMOEBA_WET,			-1, -1, FALSE,
     IMG_AMOEBA_WET
@@ -869,6 +905,10 @@ element_to_graphic[] =
     EL_AMOEBA_DROPPING,			-1, -1, FALSE,
     IMG_AMOEBA_DROPPING
   },
+  {
+    EL_AMOEBA,				ACTION_DROPPING, -1, FALSE,
+    IMG_AMOEBA_DROPPING
+  },
   {
     EL_AMOEBA_DRY,			-1, -1, FALSE,
     IMG_AMOEBA_DRY
@@ -941,6 +981,10 @@ element_to_graphic[] =
     EL_EXIT_OPEN,			-1, -1, FALSE,
     IMG_EXIT_OPEN
   },
+  {
+    EL_EXIT_CLOSING,			-1, -1, FALSE,
+    IMG_EXIT_CLOSING
+  },
   {
     EL_BALLOON,				-1, -1, FALSE,
     IMG_BALLOON
@@ -1286,8 +1330,36 @@ element_to_graphic[] =
     IMG_TIMEGATE_SWITCH_ACTIVE
   },
   {
-    EL_ENVELOPE,			-1, -1, FALSE,
-    IMG_ENVELOPE
+    EL_ENVELOPE_1,			-1, -1, FALSE,
+    IMG_ENVELOPE_1
+  },
+  {
+    EL_ENVELOPE_1,			ACTION_COLLECTING, -1, FALSE,
+    IMG_ENVELOPE_1_COLLECTING
+  },
+  {
+    EL_ENVELOPE_2,			-1, -1, FALSE,
+    IMG_ENVELOPE_2
+  },
+  {
+    EL_ENVELOPE_2,			ACTION_COLLECTING, -1, FALSE,
+    IMG_ENVELOPE_2_COLLECTING
+  },
+  {
+    EL_ENVELOPE_3,			-1, -1, FALSE,
+    IMG_ENVELOPE_3
+  },
+  {
+    EL_ENVELOPE_3,			ACTION_COLLECTING, -1, FALSE,
+    IMG_ENVELOPE_3_COLLECTING
+  },
+  {
+    EL_ENVELOPE_4,			-1, -1, FALSE,
+    IMG_ENVELOPE_4
+  },
+  {
+    EL_ENVELOPE_4,			ACTION_COLLECTING, -1, FALSE,
+    IMG_ENVELOPE_4_COLLECTING
   },
   {
     EL_SIGN_EXCLAMATION,		-1, -1, FALSE,
@@ -1542,20 +1614,20 @@ element_to_graphic[] =
     IMG_PACMAN_DOWN
   },
   {
-    EL_PACMAN,				ACTION_MOVING, MV_BIT_RIGHT, FALSE,
-    IMG_PACMAN_MOVING_RIGHT
+    EL_PACMAN,				ACTION_TURNING_FROM_RIGHT, -1, FALSE,
+    IMG_PACMAN_TURNING_FROM_RIGHT
   },
   {
-    EL_PACMAN,				ACTION_MOVING, MV_BIT_UP, FALSE,
-    IMG_PACMAN_MOVING_UP
+    EL_PACMAN,				ACTION_TURNING_FROM_UP, -1, FALSE,
+    IMG_PACMAN_TURNING_FROM_UP
   },
   {
-    EL_PACMAN,				ACTION_MOVING, MV_BIT_LEFT, FALSE,
-    IMG_PACMAN_MOVING_LEFT
+    EL_PACMAN,				ACTION_TURNING_FROM_LEFT, -1, FALSE,
+    IMG_PACMAN_TURNING_FROM_LEFT
   },
   {
-    EL_PACMAN,				ACTION_MOVING, MV_BIT_DOWN, FALSE,
-    IMG_PACMAN_MOVING_DOWN
+    EL_PACMAN,				ACTION_TURNING_FROM_DOWN, -1, FALSE,
+    IMG_PACMAN_TURNING_FROM_DOWN
   },
   {
     EL_LAMP,				-1, -1, FALSE,
@@ -2461,22 +2533,6 @@ element_to_graphic[] =
     EL_DX_UNKNOWN_42,			-1, -1, FALSE,
     IMG_CHAR_QUESTION
   },
-  {
-    EL_EM_KEY_1_FILE,			-1, -1, FALSE,
-    IMG_EM_KEY_1
-  },
-  {
-    EL_EM_KEY_2_FILE,			-1, -1, FALSE,
-    IMG_EM_KEY_2
-  },
-  {
-    EL_EM_KEY_3_FILE,			-1, -1, FALSE,
-    IMG_EM_KEY_3
-  },
-  {
-    EL_EM_KEY_4_FILE,			-1, -1, FALSE,
-    IMG_EM_KEY_4
-  },
   {
     EL_KEY_WHITE,			-1, -1, FALSE,
     IMG_CHAR_QUESTION