X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2g.c;h=2a70f7b836b6887b8298371e7aae1f71967d71d2;hb=942ec4881e3b21c130df9ae105d06c2c633fa192;hp=da23e54162bf16e5f26bd93967e635aaf3f702f2;hpb=47572a41886623747cb380fc127a814d00028c6f;p=rocksndiamonds.git

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index da23e541..2a70f7b8 100644
--- a/src/conf_e2g.c
+++ b/src/conf_e2g.c
@@ -109,74 +109,10 @@ 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_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_SP_DEFAULT,			ACTION_EXPLODING, -1, FALSE,
     IMG_SP_DEFAULT_EXPLODING
@@ -410,20 +346,36 @@ element_to_graphic[] =
     IMG_SP_SNIKSNAK_DOWN
   },
   {
-    EL_SP_SNIKSNAK,			ACTION_WAITING, MV_BIT_LEFT, FALSE,
-    IMG_SP_SNIKSNAK_WAITING_LEFT
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_LEFT, MV_BIT_UP, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_LEFT_UP
   },
   {
-    EL_SP_SNIKSNAK,			ACTION_WAITING, MV_BIT_RIGHT, FALSE,
-    IMG_SP_SNIKSNAK_WAITING_RIGHT
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_LEFT, MV_BIT_DOWN, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_LEFT_DOWN
   },
   {
-    EL_SP_SNIKSNAK,			ACTION_WAITING, MV_BIT_UP, FALSE,
-    IMG_SP_SNIKSNAK_WAITING_UP
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_RIGHT, MV_BIT_UP, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_RIGHT_UP
   },
   {
-    EL_SP_SNIKSNAK,			ACTION_WAITING, MV_BIT_DOWN, FALSE,
-    IMG_SP_SNIKSNAK_WAITING_DOWN
+    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,
@@ -697,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
@@ -750,52 +734,36 @@ element_to_graphic[] =
     IMG_SPACESHIP_MOVING_DOWN
   },
   {
-    EL_SPACESHIP,			ACTION_WAITING, MV_BIT_RIGHT, FALSE,
-    IMG_SPACESHIP_WAITING_RIGHT
-  },
-  {
-    EL_SPACESHIP,			ACTION_WAITING, MV_BIT_UP, FALSE,
-    IMG_SPACESHIP_WAITING_UP
+    EL_SPACESHIP,			ACTION_TURNING_FROM_RIGHT, MV_BIT_UP, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_RIGHT_UP
   },
   {
-    EL_SPACESHIP,			ACTION_WAITING, MV_BIT_LEFT, FALSE,
-    IMG_SPACESHIP_WAITING_LEFT
+    EL_SPACESHIP,			ACTION_TURNING_FROM_UP, MV_BIT_LEFT, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_UP_LEFT
   },
   {
-    EL_SPACESHIP,			ACTION_WAITING, MV_BIT_DOWN, FALSE,
-    IMG_SPACESHIP_WAITING_DOWN
+    EL_SPACESHIP,			ACTION_TURNING_FROM_LEFT, MV_BIT_DOWN, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_LEFT_DOWN
   },
   {
-    EL_SPACESHIP,			ACTION_XXX_RIGHT, MV_BIT_UP, FALSE,
-    IMG_SPACESHIP_XXX_RIGHT_UP
+    EL_SPACESHIP,			ACTION_TURNING_FROM_DOWN, MV_BIT_RIGHT, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_DOWN_RIGHT
   },
   {
-    EL_SPACESHIP,			ACTION_XXX_UP, MV_BIT_LEFT, FALSE,
-    IMG_SPACESHIP_XXX_UP_LEFT
+    EL_SPACESHIP,			ACTION_TURNING_FROM_RIGHT, MV_BIT_DOWN, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_RIGHT_DOWN
   },
   {
-    EL_SPACESHIP,			ACTION_XXX_LEFT, MV_BIT_DOWN, FALSE,
-    IMG_SPACESHIP_XXX_LEFT_DOWN
+    EL_SPACESHIP,			ACTION_TURNING_FROM_UP, MV_BIT_RIGHT, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_UP_RIGHT
   },
   {
-    EL_SPACESHIP,			ACTION_XXX_DOWN, MV_BIT_RIGHT, FALSE,
-    IMG_SPACESHIP_XXX_DOWN_RIGHT
+    EL_SPACESHIP,			ACTION_TURNING_FROM_LEFT, MV_BIT_UP, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_LEFT_UP
   },
   {
-    EL_SPACESHIP,			ACTION_XXX_RIGHT, MV_BIT_DOWN, FALSE,
-    IMG_SPACESHIP_XXX_RIGHT_DOWN
-  },
-  {
-    EL_SPACESHIP,			ACTION_XXX_UP, MV_BIT_RIGHT, FALSE,
-    IMG_SPACESHIP_XXX_UP_RIGHT
-  },
-  {
-    EL_SPACESHIP,			ACTION_XXX_LEFT, MV_BIT_UP, FALSE,
-    IMG_SPACESHIP_XXX_LEFT_UP
-  },
-  {
-    EL_SPACESHIP,			ACTION_XXX_DOWN, MV_BIT_LEFT, FALSE,
-    IMG_SPACESHIP_XXX_DOWN_LEFT
+    EL_SPACESHIP,			ACTION_TURNING_FROM_DOWN, MV_BIT_LEFT, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_DOWN_LEFT
   },
   {
     EL_YAMYAM,				-1, -1, FALSE,
@@ -917,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
@@ -929,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
@@ -1597,6 +1577,10 @@ element_to_graphic[] =
     EL_BIOMAZE,				-1, -1, FALSE,
     IMG_BIOMAZE
   },
+  {
+    EL_PACMAN,				-1, -1, FALSE,
+    IMG_PACMAN
+  },
   {
     EL_PACMAN_RIGHT,			-1, -1, FALSE,
     IMG_PACMAN_RIGHT
@@ -1630,20 +1614,20 @@ element_to_graphic[] =
     IMG_PACMAN_DOWN
   },
   {
-    EL_PACMAN,				ACTION_WAITING, MV_BIT_RIGHT, FALSE,
-    IMG_PACMAN_WAITING_RIGHT
+    EL_PACMAN,				ACTION_TURNING_FROM_RIGHT, -1, FALSE,
+    IMG_PACMAN_TURNING_FROM_RIGHT
   },
   {
-    EL_PACMAN,				ACTION_WAITING, MV_BIT_UP, FALSE,
-    IMG_PACMAN_WAITING_UP
+    EL_PACMAN,				ACTION_TURNING_FROM_UP, -1, FALSE,
+    IMG_PACMAN_TURNING_FROM_UP
   },
   {
-    EL_PACMAN,				ACTION_WAITING, MV_BIT_LEFT, FALSE,
-    IMG_PACMAN_WAITING_LEFT
+    EL_PACMAN,				ACTION_TURNING_FROM_LEFT, -1, FALSE,
+    IMG_PACMAN_TURNING_FROM_LEFT
   },
   {
-    EL_PACMAN,				ACTION_WAITING, MV_BIT_DOWN, FALSE,
-    IMG_PACMAN_WAITING_DOWN
+    EL_PACMAN,				ACTION_TURNING_FROM_DOWN, -1, FALSE,
+    IMG_PACMAN_TURNING_FROM_DOWN
   },
   {
     EL_LAMP,				-1, -1, FALSE,
@@ -2065,6 +2049,10 @@ element_to_graphic[] =
     EL_STONEBLOCK,			-1, -1, FALSE,
     IMG_STONEBLOCK
   },
+  {
+    EL_MAZE_RUNNER,			-1, -1, FALSE,
+    IMG_MAZE_RUNNER
+  },
   {
     EL_PLAYER_1,			-1, -1, FALSE,
     IMG_PLAYER_1