X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_e2g.c;h=45e85c93e27d1064aa348be7ff9ef77a37a0982f;hp=ed2a9abf841404c22a7f1b8e7936813df08c9293;hb=268045d6b06349f1cf10d5cc6f9516b5caa20dea;hpb=2ff21518535f914abaacf8ffc72bfbd2f319dcd5

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index ed2a9abf..45e85c93 100644
--- a/src/conf_e2g.c
+++ b/src/conf_e2g.c
@@ -36,10 +36,6 @@ element_to_graphic[] =
     EL_BD_ROCK,					-1, -1,
     IMG_BD_ROCK
   },
-  {
-    EL_BD_ROCK,					ACTION_FALLING, -1,
-    IMG_BD_ROCK_FALLING
-  },
   {
     EL_BD_ROCK,					ACTION_MOVING, MV_BIT_LEFT,
     IMG_BD_ROCK_MOVING_LEFT
@@ -48,6 +44,14 @@ element_to_graphic[] =
     EL_BD_ROCK,					ACTION_MOVING, MV_BIT_RIGHT,
     IMG_BD_ROCK_MOVING_RIGHT
   },
+  {
+    EL_BD_ROCK,					ACTION_PUSHING, MV_BIT_LEFT,
+    IMG_BD_ROCK_PUSHING_LEFT
+  },
+  {
+    EL_BD_ROCK,					ACTION_PUSHING, MV_BIT_RIGHT,
+    IMG_BD_ROCK_PUSHING_RIGHT
+  },
   {
     EL_BD_DIAMOND,				-1, -1,
     IMG_BD_DIAMOND
@@ -192,10 +196,6 @@ element_to_graphic[] =
     EL_SP_ZONK,					-1, -1,
     IMG_SP_ZONK
   },
-  {
-    EL_SP_ZONK,					ACTION_FALLING, -1,
-    IMG_SP_ZONK_FALLING
-  },
   {
     EL_SP_ZONK,					ACTION_MOVING, MV_BIT_LEFT,
     IMG_SP_ZONK_MOVING_LEFT
@@ -204,6 +204,14 @@ element_to_graphic[] =
     EL_SP_ZONK,					ACTION_MOVING, MV_BIT_RIGHT,
     IMG_SP_ZONK_MOVING_RIGHT
   },
+  {
+    EL_SP_ZONK,					ACTION_PUSHING, MV_BIT_LEFT,
+    IMG_SP_ZONK_PUSHING_LEFT
+  },
+  {
+    EL_SP_ZONK,					ACTION_PUSHING, MV_BIT_RIGHT,
+    IMG_SP_ZONK_PUSHING_RIGHT
+  },
   {
     EL_SP_BASE,					-1, -1,
     IMG_SP_BASE
@@ -268,10 +276,6 @@ element_to_graphic[] =
     EL_SP_INFOTRON,				-1, -1,
     IMG_SP_INFOTRON
   },
-  {
-    EL_SP_INFOTRON,				ACTION_FALLING, -1,
-    IMG_SP_INFOTRON_FALLING
-  },
   {
     EL_SP_CHIP_SINGLE,				-1, -1,
     IMG_SP_CHIP_SINGLE
@@ -324,22 +328,10 @@ element_to_graphic[] =
     EL_SP_DISK_ORANGE,				-1, -1,
     IMG_SP_DISK_ORANGE
   },
-  {
-    EL_SP_DISK_ORANGE,				ACTION_FALLING, -1,
-    IMG_SP_DISK_ORANGE_FALLING
-  },
-  {
-    EL_SP_DISK_ORANGE,				ACTION_PUSHING, -1,
-    IMG_SP_DISK_ORANGE_PUSHING
-  },
   {
     EL_SP_DISK_YELLOW,				-1, -1,
     IMG_SP_DISK_YELLOW
   },
-  {
-    EL_SP_DISK_YELLOW,				ACTION_PUSHING, -1,
-    IMG_SP_DISK_YELLOW_PUSHING
-  },
   {
     EL_SP_DISK_RED,				-1, -1,
     IMG_SP_DISK_RED
@@ -348,14 +340,6 @@ element_to_graphic[] =
     EL_SP_DISK_RED,				ACTION_COLLECTING, -1,
     IMG_SP_DISK_RED_COLLECTING
   },
-  {
-    EL_SP_DISK_RED_ACTIVE,			-1, -1,
-    IMG_SP_DISK_RED_ACTIVE
-  },
-  {
-    EL_SP_DISK_RED,				ACTION_ACTIVE, -1,
-    IMG_SP_DISK_RED_ACTIVE
-  },
   {
     EL_SP_PORT_RIGHT,				-1, -1,
     IMG_SP_PORT_RIGHT
@@ -556,10 +540,6 @@ element_to_graphic[] =
     EL_ROCK,					-1, -1,
     IMG_ROCK
   },
-  {
-    EL_ROCK,					ACTION_FALLING, -1,
-    IMG_ROCK_FALLING
-  },
   {
     EL_ROCK,					ACTION_MOVING, MV_BIT_LEFT,
     IMG_ROCK_MOVING_LEFT
@@ -568,6 +548,14 @@ element_to_graphic[] =
     EL_ROCK,					ACTION_MOVING, MV_BIT_RIGHT,
     IMG_ROCK_MOVING_RIGHT
   },
+  {
+    EL_ROCK,					ACTION_PUSHING, MV_BIT_LEFT,
+    IMG_ROCK_PUSHING_LEFT
+  },
+  {
+    EL_ROCK,					ACTION_PUSHING, MV_BIT_RIGHT,
+    IMG_ROCK_PUSHING_RIGHT
+  },
   {
     EL_EMERALD,					-1, -1,
     IMG_EMERALD
@@ -608,18 +596,6 @@ element_to_graphic[] =
     EL_NUT,					-1, -1,
     IMG_NUT
   },
-  {
-    EL_NUT,					ACTION_FALLING, -1,
-    IMG_NUT_FALLING
-  },
-  {
-    EL_NUT,					ACTION_MOVING, MV_BIT_LEFT,
-    IMG_NUT_MOVING_LEFT
-  },
-  {
-    EL_NUT,					ACTION_MOVING, MV_BIT_RIGHT,
-    IMG_NUT_MOVING_RIGHT
-  },
   {
     EL_NUT_BREAKING,				-1, -1,
     IMG_NUT_BREAKING
@@ -964,6 +940,10 @@ element_to_graphic[] =
     EL_BALLOON,					ACTION_MOVING, -1,
     IMG_BALLOON_MOVING
   },
+  {
+    EL_BALLOON,					ACTION_PUSHING, -1,
+    IMG_BALLOON_PUSHING
+  },
   {
     EL_BALLOON_SWITCH_LEFT,			-1, -1,
     IMG_BALLOON_SWITCH_LEFT
@@ -988,10 +968,6 @@ element_to_graphic[] =
     EL_SPRING,					-1, -1,
     IMG_SPRING
   },
-  {
-    EL_SPRING,					ACTION_MOVING, -1,
-    IMG_SPRING_MOVING
-  },
   {
     EL_EMC_STEELWALL_1,				-1, -1,
     IMG_EMC_STEELWALL_1
@@ -1704,26 +1680,66 @@ element_to_graphic[] =
     EL_DARK_YAMYAM,				-1, -1,
     IMG_DARK_YAMYAM
   },
+  {
+    EL_DYNABOMB,				-1, -1,
+    IMG_DYNABOMB
+  },
   {
     EL_DYNABOMB_ACTIVE,				-1, -1,
     IMG_DYNABOMB_ACTIVE
   },
+  {
+    EL_DYNABOMB,				ACTION_ACTIVE, -1,
+    IMG_DYNABOMB_ACTIVE
+  },
+  {
+    EL_DYNABOMB_PLAYER_1,			-1, -1,
+    IMG_DYNABOMB_PLAYER_1
+  },
   {
     EL_DYNABOMB_PLAYER_1_ACTIVE,		-1, -1,
     IMG_DYNABOMB_PLAYER_1_ACTIVE
   },
+  {
+    EL_DYNABOMB_PLAYER_1,			ACTION_ACTIVE, -1,
+    IMG_DYNABOMB_PLAYER_1_ACTIVE
+  },
+  {
+    EL_DYNABOMB_PLAYER_2,			-1, -1,
+    IMG_DYNABOMB_PLAYER_2
+  },
   {
     EL_DYNABOMB_PLAYER_2_ACTIVE,		-1, -1,
     IMG_DYNABOMB_PLAYER_2_ACTIVE
   },
+  {
+    EL_DYNABOMB_PLAYER_2,			ACTION_ACTIVE, -1,
+    IMG_DYNABOMB_PLAYER_2_ACTIVE
+  },
+  {
+    EL_DYNABOMB_PLAYER_3,			-1, -1,
+    IMG_DYNABOMB_PLAYER_3
+  },
   {
     EL_DYNABOMB_PLAYER_3_ACTIVE,		-1, -1,
     IMG_DYNABOMB_PLAYER_3_ACTIVE
   },
+  {
+    EL_DYNABOMB_PLAYER_3,			ACTION_ACTIVE, -1,
+    IMG_DYNABOMB_PLAYER_3_ACTIVE
+  },
+  {
+    EL_DYNABOMB_PLAYER_4,			-1, -1,
+    IMG_DYNABOMB_PLAYER_4
+  },
   {
     EL_DYNABOMB_PLAYER_4_ACTIVE,		-1, -1,
     IMG_DYNABOMB_PLAYER_4_ACTIVE
   },
+  {
+    EL_DYNABOMB_PLAYER_4,			ACTION_ACTIVE, -1,
+    IMG_DYNABOMB_PLAYER_4_ACTIVE
+  },
   {
     EL_DYNABOMB_INCREASE_NUMBER,		-1, -1,
     IMG_DYNABOMB_INCREASE_NUMBER
@@ -1948,10 +1964,6 @@ element_to_graphic[] =
     EL_SATELLITE,				-1, -1,
     IMG_SATELLITE
   },
-  {
-    EL_SATELLITE,				ACTION_MOVING, -1,
-    IMG_SATELLITE_MOVING
-  },
   {
     EL_STONEBLOCK,				-1, -1,
     IMG_STONEBLOCK