X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2g.c;h=f53dac2ee648194d4f401e123f0714ff15cd3911;hb=85279bc51ad11bce89beae5b0e02f1faec520afa;hp=90cd877524c580fabae9bbab1b0fc0756b26380d;hpb=c89ae8e2fae58982b3425d2fc340046a908e5c7c;p=rocksndiamonds.git

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index 90cd8775..f53dac2e 100644
--- a/src/conf_e2g.c
+++ b/src/conf_e2g.c
@@ -180,6 +180,10 @@ element_to_graphic[] =
     EL_BD_FIREFLY,				ACTION_MOVING, -1,
     IMG_BD_FIREFLY_MOVING
   },
+  {
+    EL_SP_EMPTY_SPACE,				-1, -1,
+    IMG_SP_EMPTY_SPACE
+  },
   {
     EL_SP_ZONK,					-1, -1,
     IMG_SP_ZONK
@@ -220,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
@@ -484,10 +496,6 @@ element_to_graphic[] =
     EL_SAND,					-1, -1,
     IMG_SAND
   },
-  {
-    EL_SAND_CRUMBLED,				-1, -1,
-    IMG_SAND_CRUMBLED
-  },
   {
     EL_SAND,					ACTION_DIGGING, MV_BIT_LEFT,
     IMG_SAND_DIGGING_LEFT
@@ -504,6 +512,26 @@ element_to_graphic[] =
     EL_SAND,					ACTION_DIGGING, MV_BIT_DOWN,
     IMG_SAND_DIGGING_DOWN
   },
+  {
+    EL_SAND_CRUMBLED,				-1, -1,
+    IMG_SAND_CRUMBLED
+  },
+  {
+    EL_SAND_CRUMBLED,				ACTION_DIGGING, MV_BIT_LEFT,
+    IMG_SAND_CRUMBLED_DIGGING_LEFT
+  },
+  {
+    EL_SAND_CRUMBLED,				ACTION_DIGGING, MV_BIT_RIGHT,
+    IMG_SAND_CRUMBLED_DIGGING_RIGHT
+  },
+  {
+    EL_SAND_CRUMBLED,				ACTION_DIGGING, MV_BIT_UP,
+    IMG_SAND_CRUMBLED_DIGGING_UP
+  },
+  {
+    EL_SAND_CRUMBLED,				ACTION_DIGGING, MV_BIT_DOWN,
+    IMG_SAND_CRUMBLED_DIGGING_DOWN
+  },
   {
     EL_WALL,					-1, -1,
     IMG_WALL
@@ -544,6 +572,10 @@ element_to_graphic[] =
     EL_EMERALD,					ACTION_FALLING, -1,
     IMG_EMERALD_FALLING
   },
+  {
+    EL_EMERALD,					ACTION_COLLECTING, -1,
+    IMG_EMERALD_COLLECTING
+  },
   {
     EL_DIAMOND,					-1, -1,
     IMG_DIAMOND
@@ -556,6 +588,10 @@ element_to_graphic[] =
     EL_DIAMOND,					ACTION_FALLING, -1,
     IMG_DIAMOND_FALLING
   },
+  {
+    EL_DIAMOND,					ACTION_COLLECTING, -1,
+    IMG_DIAMOND_COLLECTING
+  },
   {
     EL_BOMB,					-1, -1,
     IMG_BOMB
@@ -604,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
@@ -636,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
@@ -668,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
@@ -1436,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
@@ -1468,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
@@ -1904,6 +2000,22 @@ element_to_graphic[] =
     EL_PLAYER_1,				ACTION_DIGGING, MV_BIT_RIGHT,
     IMG_PLAYER_1_DIGGING_RIGHT
   },
+  {
+    EL_PLAYER_1,				ACTION_COLLECTING, MV_BIT_DOWN,
+    IMG_PLAYER_1_COLLECTING_DOWN
+  },
+  {
+    EL_PLAYER_1,				ACTION_COLLECTING, MV_BIT_UP,
+    IMG_PLAYER_1_COLLECTING_UP
+  },
+  {
+    EL_PLAYER_1,				ACTION_COLLECTING, MV_BIT_LEFT,
+    IMG_PLAYER_1_COLLECTING_LEFT
+  },
+  {
+    EL_PLAYER_1,				ACTION_COLLECTING, MV_BIT_RIGHT,
+    IMG_PLAYER_1_COLLECTING_RIGHT
+  },
   {
     EL_PLAYER_1,				ACTION_PUSHING, MV_BIT_DOWN,
     IMG_PLAYER_1_PUSHING_DOWN
@@ -1988,6 +2100,22 @@ element_to_graphic[] =
     EL_PLAYER_2,				ACTION_DIGGING, MV_BIT_RIGHT,
     IMG_PLAYER_2_DIGGING_RIGHT
   },
+  {
+    EL_PLAYER_2,				ACTION_COLLECTING, MV_BIT_DOWN,
+    IMG_PLAYER_2_COLLECTING_DOWN
+  },
+  {
+    EL_PLAYER_2,				ACTION_COLLECTING, MV_BIT_UP,
+    IMG_PLAYER_2_COLLECTING_UP
+  },
+  {
+    EL_PLAYER_2,				ACTION_COLLECTING, MV_BIT_LEFT,
+    IMG_PLAYER_2_COLLECTING_LEFT
+  },
+  {
+    EL_PLAYER_2,				ACTION_COLLECTING, MV_BIT_RIGHT,
+    IMG_PLAYER_2_COLLECTING_RIGHT
+  },
   {
     EL_PLAYER_2,				ACTION_PUSHING, MV_BIT_DOWN,
     IMG_PLAYER_2_PUSHING_DOWN
@@ -2072,6 +2200,22 @@ element_to_graphic[] =
     EL_PLAYER_3,				ACTION_DIGGING, MV_BIT_RIGHT,
     IMG_PLAYER_3_DIGGING_RIGHT
   },
+  {
+    EL_PLAYER_3,				ACTION_COLLECTING, MV_BIT_DOWN,
+    IMG_PLAYER_3_COLLECTING_DOWN
+  },
+  {
+    EL_PLAYER_3,				ACTION_COLLECTING, MV_BIT_UP,
+    IMG_PLAYER_3_COLLECTING_UP
+  },
+  {
+    EL_PLAYER_3,				ACTION_COLLECTING, MV_BIT_LEFT,
+    IMG_PLAYER_3_COLLECTING_LEFT
+  },
+  {
+    EL_PLAYER_3,				ACTION_COLLECTING, MV_BIT_RIGHT,
+    IMG_PLAYER_3_COLLECTING_RIGHT
+  },
   {
     EL_PLAYER_3,				ACTION_PUSHING, MV_BIT_DOWN,
     IMG_PLAYER_3_PUSHING_DOWN
@@ -2156,6 +2300,22 @@ element_to_graphic[] =
     EL_PLAYER_4,				ACTION_DIGGING, MV_BIT_RIGHT,
     IMG_PLAYER_4_DIGGING_RIGHT
   },
+  {
+    EL_PLAYER_4,				ACTION_COLLECTING, MV_BIT_DOWN,
+    IMG_PLAYER_4_COLLECTING_DOWN
+  },
+  {
+    EL_PLAYER_4,				ACTION_COLLECTING, MV_BIT_UP,
+    IMG_PLAYER_4_COLLECTING_UP
+  },
+  {
+    EL_PLAYER_4,				ACTION_COLLECTING, MV_BIT_LEFT,
+    IMG_PLAYER_4_COLLECTING_LEFT
+  },
+  {
+    EL_PLAYER_4,				ACTION_COLLECTING, MV_BIT_RIGHT,
+    IMG_PLAYER_4_COLLECTING_RIGHT
+  },
   {
     EL_PLAYER_4,				ACTION_PUSHING, MV_BIT_DOWN,
     IMG_PLAYER_4_PUSHING_DOWN
@@ -2569,36 +2729,48 @@ element_to_graphic[] =
     IMG_CHAR_Z
   },
   {
-    EL_CHAR_AE,					-1, -1,
-    IMG_CHAR_AE
+    EL_CHAR_BRACKETLEFT,			-1, -1,
+    IMG_CHAR_BRACKETLEFT
   },
   {
-    EL_CHAR_OE,					-1, -1,
-    IMG_CHAR_OE
+    EL_CHAR_BACKSLASH,				-1, -1,
+    IMG_CHAR_BACKSLASH
   },
   {
-    EL_CHAR_UE,					-1, -1,
-    IMG_CHAR_UE
+    EL_CHAR_BRACKETRIGHT,			-1, -1,
+    IMG_CHAR_BRACKETRIGHT
   },
   {
-    EL_CHAR_COPYRIGHT,				-1, -1,
-    IMG_CHAR_COPYRIGHT
+    EL_CHAR_ASCIICIRCUM,			-1, -1,
+    IMG_CHAR_ASCIICIRCUM
   },
   {
     EL_CHAR_UNDERSCORE,				-1, -1,
     IMG_CHAR_UNDERSCORE
   },
   {
-    EL_CHAR_EMPTY,				-1, -1,
-    IMG_CHAR_EMPTY
+    EL_CHAR_COPYRIGHT,				-1, -1,
+    IMG_CHAR_COPYRIGHT
+  },
+  {
+    EL_CHAR_AUMLAUT,				-1, -1,
+    IMG_CHAR_AUMLAUT
+  },
+  {
+    EL_CHAR_OUMLAUT,				-1, -1,
+    IMG_CHAR_OUMLAUT
+  },
+  {
+    EL_CHAR_UUMLAUT,				-1, -1,
+    IMG_CHAR_UUMLAUT
   },
   {
     EL_CHAR_DEGREE,				-1, -1,
     IMG_CHAR_DEGREE
   },
   {
-    EL_CHAR_TM,					-1, -1,
-    IMG_CHAR_TM
+    EL_CHAR_TRADEMARK,				-1, -1,
+    IMG_CHAR_TRADEMARK
   },
   {
     EL_CHAR_CURSOR,				-1, -1,