X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fconf_e2g.c;h=f53dac2ee648194d4f401e123f0714ff15cd3911;hb=213773d641290a743d56c17165d0bafec72cc0aa;hp=0a9057c059947aab0e6f7c41f7656cfbbb39541a;hpb=ac4c028b525860750de315d626730ac493f56944;p=rocksndiamonds.git

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index 0a9057c0..f53dac2e 100644
--- a/src/conf_e2g.c
+++ b/src/conf_e2g.c
@@ -224,6 +224,14 @@ element_to_graphic[] =
     EL_SP_MURPHY,				ACTION_DIGGING, MV_BIT_RIGHT,
     IMG_SP_MURPHY_DIGGING_RIGHT
   },
+  {
+    EL_SP_MURPHY,				ACTION_COLLECTING, MV_BIT_LEFT,
+    IMG_SP_MURPHY_COLLECTING_LEFT
+  },
+  {
+    EL_SP_MURPHY,				ACTION_COLLECTING, MV_BIT_RIGHT,
+    IMG_SP_MURPHY_COLLECTING_RIGHT
+  },
   {
     EL_SP_MURPHY,				ACTION_PUSHING, MV_BIT_LEFT,
     IMG_SP_MURPHY_PUSHING_LEFT
@@ -632,6 +640,10 @@ element_to_graphic[] =
     EL_WALL_DIAMOND,				-1, -1,
     IMG_WALL_DIAMOND
   },
+  {
+    EL_BUG,					-1, -1,
+    IMG_BUG
+  },
   {
     EL_BUG_RIGHT,				-1, -1,
     IMG_BUG_RIGHT
@@ -664,6 +676,26 @@ element_to_graphic[] =
     EL_BUG,					-1, MV_BIT_DOWN,
     IMG_BUG_DOWN
   },
+  {
+    EL_BUG,					ACTION_MOVING, MV_BIT_RIGHT,
+    IMG_BUG_MOVING_RIGHT
+  },
+  {
+    EL_BUG,					ACTION_MOVING, MV_BIT_UP,
+    IMG_BUG_MOVING_UP
+  },
+  {
+    EL_BUG,					ACTION_MOVING, MV_BIT_LEFT,
+    IMG_BUG_MOVING_LEFT
+  },
+  {
+    EL_BUG,					ACTION_MOVING, MV_BIT_DOWN,
+    IMG_BUG_MOVING_DOWN
+  },
+  {
+    EL_SPACESHIP,				-1, -1,
+    IMG_SPACESHIP
+  },
   {
     EL_SPACESHIP_RIGHT,				-1, -1,
     IMG_SPACESHIP_RIGHT
@@ -696,6 +728,22 @@ element_to_graphic[] =
     EL_SPACESHIP,				-1, MV_BIT_DOWN,
     IMG_SPACESHIP_DOWN
   },
+  {
+    EL_SPACESHIP,				ACTION_MOVING, MV_BIT_RIGHT,
+    IMG_SPACESHIP_MOVING_RIGHT
+  },
+  {
+    EL_SPACESHIP,				ACTION_MOVING, MV_BIT_UP,
+    IMG_SPACESHIP_MOVING_UP
+  },
+  {
+    EL_SPACESHIP,				ACTION_MOVING, MV_BIT_LEFT,
+    IMG_SPACESHIP_MOVING_LEFT
+  },
+  {
+    EL_SPACESHIP,				ACTION_MOVING, MV_BIT_DOWN,
+    IMG_SPACESHIP_MOVING_DOWN
+  },
   {
     EL_YAMYAM,					-1, -1,
     IMG_YAMYAM
@@ -857,68 +905,36 @@ element_to_graphic[] =
     IMG_EM_KEY_4
   },
   {
-    EL_EM_GATE_1_CLOSED,			-1, -1,
-    IMG_EM_GATE_1_CLOSED
-  },
-  {
-    EL_EM_GATE_1_OPEN,				-1, -1,
-    IMG_EM_GATE_1_OPEN
-  },
-  {
-    EL_EM_GATE_2_CLOSED,			-1, -1,
-    IMG_EM_GATE_2_CLOSED
-  },
-  {
-    EL_EM_GATE_2_OPEN,				-1, -1,
-    IMG_EM_GATE_2_OPEN
-  },
-  {
-    EL_EM_GATE_3_CLOSED,			-1, -1,
-    IMG_EM_GATE_3_CLOSED
-  },
-  {
-    EL_EM_GATE_3_OPEN,				-1, -1,
-    IMG_EM_GATE_3_OPEN
-  },
-  {
-    EL_EM_GATE_4_CLOSED,			-1, -1,
-    IMG_EM_GATE_4_CLOSED
-  },
-  {
-    EL_EM_GATE_4_OPEN,				-1, -1,
-    IMG_EM_GATE_4_OPEN
+    EL_EM_GATE_1,				-1, -1,
+    IMG_EM_GATE_1
   },
   {
-    EL_EM_GATE_1_GRAY_CLOSED,			-1, -1,
-    IMG_EM_GATE_1_GRAY_CLOSED
+    EL_EM_GATE_2,				-1, -1,
+    IMG_EM_GATE_2
   },
   {
-    EL_EM_GATE_1_GRAY_OPEN,			-1, -1,
-    IMG_EM_GATE_1_GRAY_OPEN
+    EL_EM_GATE_3,				-1, -1,
+    IMG_EM_GATE_3
   },
   {
-    EL_EM_GATE_2_GRAY_CLOSED,			-1, -1,
-    IMG_EM_GATE_2_GRAY_CLOSED
+    EL_EM_GATE_4,				-1, -1,
+    IMG_EM_GATE_4
   },
   {
-    EL_EM_GATE_2_GRAY_OPEN,			-1, -1,
-    IMG_EM_GATE_2_GRAY_OPEN
+    EL_EM_GATE_1_GRAY,				-1, -1,
+    IMG_EM_GATE_1_GRAY
   },
   {
-    EL_EM_GATE_3_GRAY_CLOSED,			-1, -1,
-    IMG_EM_GATE_3_GRAY_CLOSED
+    EL_EM_GATE_2_GRAY,				-1, -1,
+    IMG_EM_GATE_2_GRAY
   },
   {
-    EL_EM_GATE_3_GRAY_OPEN,			-1, -1,
-    IMG_EM_GATE_3_GRAY_OPEN
+    EL_EM_GATE_3_GRAY,				-1, -1,
+    IMG_EM_GATE_3_GRAY
   },
   {
-    EL_EM_GATE_4_GRAY_CLOSED,			-1, -1,
-    IMG_EM_GATE_4_GRAY_CLOSED
-  },
-  {
-    EL_EM_GATE_4_GRAY_OPEN,			-1, -1,
-    IMG_EM_GATE_4_GRAY_OPEN
+    EL_EM_GATE_4_GRAY,				-1, -1,
+    IMG_EM_GATE_4_GRAY
   },
   {
     EL_EXIT_CLOSED,				-1, -1,
@@ -1457,68 +1473,36 @@ element_to_graphic[] =
     IMG_KEY_4
   },
   {
-    EL_GATE_1_CLOSED,				-1, -1,
-    IMG_GATE_1_CLOSED
-  },
-  {
-    EL_GATE_1_OPEN,				-1, -1,
-    IMG_GATE_1_OPEN
-  },
-  {
-    EL_GATE_2_CLOSED,				-1, -1,
-    IMG_GATE_2_CLOSED
-  },
-  {
-    EL_GATE_2_OPEN,				-1, -1,
-    IMG_GATE_2_OPEN
-  },
-  {
-    EL_GATE_3_CLOSED,				-1, -1,
-    IMG_GATE_3_CLOSED
-  },
-  {
-    EL_GATE_3_OPEN,				-1, -1,
-    IMG_GATE_3_OPEN
+    EL_GATE_1,					-1, -1,
+    IMG_GATE_1
   },
   {
-    EL_GATE_4_CLOSED,				-1, -1,
-    IMG_GATE_4_CLOSED
+    EL_GATE_2,					-1, -1,
+    IMG_GATE_2
   },
   {
-    EL_GATE_4_OPEN,				-1, -1,
-    IMG_GATE_4_OPEN
+    EL_GATE_3,					-1, -1,
+    IMG_GATE_3
   },
   {
-    EL_GATE_1_GRAY_CLOSED,			-1, -1,
-    IMG_GATE_1_GRAY_CLOSED
+    EL_GATE_4,					-1, -1,
+    IMG_GATE_4
   },
   {
-    EL_GATE_1_GRAY_OPEN,			-1, -1,
-    IMG_GATE_1_GRAY_OPEN
+    EL_GATE_1_GRAY,				-1, -1,
+    IMG_GATE_1_GRAY
   },
   {
-    EL_GATE_2_GRAY_CLOSED,			-1, -1,
-    IMG_GATE_2_GRAY_CLOSED
+    EL_GATE_2_GRAY,				-1, -1,
+    IMG_GATE_2_GRAY
   },
   {
-    EL_GATE_2_GRAY_OPEN,			-1, -1,
-    IMG_GATE_2_GRAY_OPEN
+    EL_GATE_3_GRAY,				-1, -1,
+    IMG_GATE_3_GRAY
   },
   {
-    EL_GATE_3_GRAY_CLOSED,			-1, -1,
-    IMG_GATE_3_GRAY_CLOSED
-  },
-  {
-    EL_GATE_3_GRAY_OPEN,			-1, -1,
-    IMG_GATE_3_GRAY_OPEN
-  },
-  {
-    EL_GATE_4_GRAY_CLOSED,			-1, -1,
-    IMG_GATE_4_GRAY_CLOSED
-  },
-  {
-    EL_GATE_4_GRAY_OPEN,			-1, -1,
-    IMG_GATE_4_GRAY_OPEN
+    EL_GATE_4_GRAY,				-1, -1,
+    IMG_GATE_4_GRAY
   },
   {
     EL_GAME_OF_LIFE,				-1, -1,
@@ -1528,6 +1512,10 @@ element_to_graphic[] =
     EL_BIOMAZE,					-1, -1,
     IMG_BIOMAZE
   },
+  {
+    EL_PACMAN,					-1, -1,
+    IMG_PACMAN
+  },
   {
     EL_PACMAN_RIGHT,				-1, -1,
     IMG_PACMAN_RIGHT
@@ -1560,6 +1548,22 @@ element_to_graphic[] =
     EL_PACMAN,					-1, MV_BIT_DOWN,
     IMG_PACMAN_DOWN
   },
+  {
+    EL_PACMAN,					ACTION_MOVING, MV_BIT_RIGHT,
+    IMG_PACMAN_MOVING_RIGHT
+  },
+  {
+    EL_PACMAN,					ACTION_MOVING, MV_BIT_UP,
+    IMG_PACMAN_MOVING_UP
+  },
+  {
+    EL_PACMAN,					ACTION_MOVING, MV_BIT_LEFT,
+    IMG_PACMAN_MOVING_LEFT
+  },
+  {
+    EL_PACMAN,					ACTION_MOVING, MV_BIT_DOWN,
+    IMG_PACMAN_MOVING_DOWN
+  },
   {
     EL_LAMP,					-1, -1,
     IMG_LAMP