X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2g.c;h=ed2a9abf841404c22a7f1b8e7936813df08c9293;hb=c9bb6e0a6eecbf84320be79b121bd957a938a08c;hp=73e1a725d86925cc8695d011c1e770e8fbe9e78e;hpb=6435b79b71c4033de78ab3e611ee63f6a2147874;p=rocksndiamonds.git

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index 73e1a725..ed2a9abf 100644
--- a/src/conf_e2g.c
+++ b/src/conf_e2g.c
@@ -180,6 +180,14 @@ element_to_graphic[] =
     EL_BD_FIREFLY,				ACTION_MOVING, -1,
     IMG_BD_FIREFLY_MOVING
   },
+  {
+    EL_SP_DEFAULT,				ACTION_EXPLODING, -1,
+    IMG_SP_DEFAULT_EXPLODING
+  },
+  {
+    EL_SP_EMPTY_SPACE,				-1, -1,
+    IMG_SP_EMPTY_SPACE
+  },
   {
     EL_SP_ZONK,					-1, -1,
     IMG_SP_ZONK
@@ -220,6 +228,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
@@ -408,6 +424,10 @@ element_to_graphic[] =
     EL_SP_ELECTRON,				-1, -1,
     IMG_SP_ELECTRON
   },
+  {
+    EL_SP_ELECTRON,				ACTION_EXPLODING, -1,
+    IMG_SP_ELECTRON_EXPLODING
+  },
   {
     EL_SP_TERMINAL,				-1, -1,
     IMG_SP_TERMINAL
@@ -484,10 +504,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 +520,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 +580,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 +596,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 +648,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 +684,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 +736,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 +1520,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 +1556,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
@@ -2253,8 +2357,8 @@ element_to_graphic[] =
     IMG_PLAYER_4_SNAPPING_RIGHT
   },
   {
-    EL_EXPLOSION,				-1, -1,
-    IMG_EXPLOSION
+    EL_DEFAULT,					ACTION_EXPLODING, -1,
+    IMG_DEFAULT_EXPLODING
   },
   {
     EL_STEELWALL_TOPLEFT,			-1, -1,
@@ -2633,36 +2737,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,