X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2g.c;h=af01c278ede470c848ef5d2c2401989288ba9bb6;hb=4be46f1030df4cb7db0ce7c46d2518334861731a;hp=f6b4874bf1ef93944ccb9978af23f3e3f24d77ef;hpb=cd9add1d9479d1938d05ca9df4f31c3f99bd5f3e;p=rocksndiamonds.git

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index f6b4874b..af01c278 100644
--- a/src/conf_e2g.c
+++ b/src/conf_e2g.c
@@ -16,7 +16,7 @@
 #ifndef CONF_E2G_C
 #define CONF_E2G_C
 
-/* values for element/graphics configuration */
+/* values for element/graphics mapping configuration */
 
 static struct
 {
@@ -41,13 +41,21 @@ element_to_graphic[] =
     IMG_BD_ROCK_FALLING
   },
   {
-    EL_BD_ROCK,					-1, GFX_ACTION_PUSHING,
-    IMG_BD_ROCK_PUSHING
+    EL_BD_ROCK,					MV_LEFT, GFX_ACTION_MOVING,
+    IMG_BD_ROCK_MOVING_LEFT
+  },
+  {
+    EL_BD_ROCK,					MV_RIGHT, GFX_ACTION_MOVING,
+    IMG_BD_ROCK_MOVING_RIGHT
   },
   {
     EL_BD_DIAMOND,				-1, -1,
     IMG_BD_DIAMOND
   },
+  {
+    EL_BD_DIAMOND,				-1, GFX_ACTION_MOVING,
+    IMG_BD_DIAMOND_MOVING
+  },
   {
     EL_BD_DIAMOND,				-1, GFX_ACTION_FALLING,
     IMG_BD_DIAMOND_FALLING
@@ -189,8 +197,12 @@ element_to_graphic[] =
     IMG_SP_ZONK_FALLING
   },
   {
-    EL_SP_ZONK,					-1, GFX_ACTION_PUSHING,
-    IMG_SP_ZONK_PUSHING
+    EL_SP_ZONK,					MV_LEFT, GFX_ACTION_MOVING,
+    IMG_SP_ZONK_MOVING_LEFT
+  },
+  {
+    EL_SP_ZONK,					MV_RIGHT, GFX_ACTION_MOVING,
+    IMG_SP_ZONK_MOVING_RIGHT
   },
   {
     EL_SP_BASE,					-1, -1,
@@ -424,6 +436,10 @@ element_to_graphic[] =
     EL_SP_BUGGY_BASE,				-1, -1,
     IMG_SP_BUGGY_BASE
   },
+  {
+    EL_SP_BUGGY_BASE_ACTIVATING,		-1, -1,
+    IMG_SP_BUGGY_BASE_ACTIVATING
+  },
   {
     EL_SP_BUGGY_BASE_ACTIVE,			-1, -1,
     IMG_SP_BUGGY_BASE_ACTIVE
@@ -497,13 +513,21 @@ element_to_graphic[] =
     IMG_ROCK_FALLING
   },
   {
-    EL_ROCK,					-1, GFX_ACTION_PUSHING,
-    IMG_ROCK_PUSHING
+    EL_ROCK,					MV_LEFT, GFX_ACTION_MOVING,
+    IMG_ROCK_MOVING_LEFT
+  },
+  {
+    EL_ROCK,					MV_RIGHT, GFX_ACTION_MOVING,
+    IMG_ROCK_MOVING_RIGHT
   },
   {
     EL_EMERALD,					-1, -1,
     IMG_EMERALD
   },
+  {
+    EL_EMERALD,					-1, GFX_ACTION_MOVING,
+    IMG_EMERALD_MOVING
+  },
   {
     EL_EMERALD,					-1, GFX_ACTION_FALLING,
     IMG_EMERALD_FALLING
@@ -512,6 +536,10 @@ element_to_graphic[] =
     EL_DIAMOND,					-1, -1,
     IMG_DIAMOND
   },
+  {
+    EL_DIAMOND,					-1, GFX_ACTION_MOVING,
+    IMG_DIAMOND_MOVING
+  },
   {
     EL_DIAMOND,					-1, GFX_ACTION_FALLING,
     IMG_DIAMOND_FALLING
@@ -525,7 +553,19 @@ element_to_graphic[] =
     IMG_NUT
   },
   {
-    EL_NUT,					-1, GFX_ACTION_CRACKING,
+    EL_NUT,					-1, GFX_ACTION_FALLING,
+    IMG_NUT_FALLING
+  },
+  {
+    EL_NUT,					MV_LEFT, GFX_ACTION_MOVING,
+    IMG_NUT_MOVING_LEFT
+  },
+  {
+    EL_NUT,					MV_RIGHT, GFX_ACTION_MOVING,
+    IMG_NUT_MOVING_RIGHT
+  },
+  {
+    EL_NUT_CRACKING,				-1, -1,
     IMG_NUT_CRACKING
   },
   {
@@ -620,6 +660,10 @@ element_to_graphic[] =
     EL_ROBOT,					-1, -1,
     IMG_ROBOT
   },
+  {
+    EL_ROBOT,					-1, GFX_ACTION_MOVING,
+    IMG_ROBOT_MOVING
+  },
   {
     EL_ROBOT_WHEEL,				-1, -1,
     IMG_ROBOT_WHEEL
@@ -693,12 +737,12 @@ element_to_graphic[] =
     IMG_ACID
   },
   {
-    EL_ACID_SPLASHING_LEFT,			-1, -1,
-    IMG_ACID_SPLASHING_LEFT
+    EL_ACID_SPLASH_LEFT,			-1, -1,
+    IMG_ACID_SPLASH_LEFT
   },
   {
-    EL_ACID_SPLASHING_RIGHT,			-1, -1,
-    IMG_ACID_SPLASHING_RIGHT
+    EL_ACID_SPLASH_RIGHT,			-1, -1,
+    IMG_ACID_SPLASH_RIGHT
   },
   {
     EL_AMOEBA_DROP,				-1, -1,
@@ -885,7 +929,7 @@ element_to_graphic[] =
     IMG_SPRING
   },
   {
-    EL_SPRING_MOVING,				-1, -1,
+    EL_SPRING,					-1, GFX_ACTION_MOVING,
     IMG_SPRING_MOVING
   },
   {
@@ -1384,6 +1428,10 @@ element_to_graphic[] =
     EL_EMERALD_YELLOW,				-1, -1,
     IMG_EMERALD_YELLOW
   },
+  {
+    EL_EMERALD_YELLOW,				-1, GFX_ACTION_MOVING,
+    IMG_EMERALD_YELLOW_MOVING
+  },
   {
     EL_EMERALD_YELLOW,				-1, GFX_ACTION_FALLING,
     IMG_EMERALD_YELLOW_FALLING
@@ -1392,6 +1440,10 @@ element_to_graphic[] =
     EL_EMERALD_RED,				-1, -1,
     IMG_EMERALD_RED
   },
+  {
+    EL_EMERALD_RED,				-1, GFX_ACTION_MOVING,
+    IMG_EMERALD_RED_MOVING
+  },
   {
     EL_EMERALD_RED,				-1, GFX_ACTION_FALLING,
     IMG_EMERALD_RED_FALLING
@@ -1400,6 +1452,10 @@ element_to_graphic[] =
     EL_EMERALD_PURPLE,				-1, -1,
     IMG_EMERALD_PURPLE
   },
+  {
+    EL_EMERALD_PURPLE,				-1, GFX_ACTION_MOVING,
+    IMG_EMERALD_PURPLE_MOVING
+  },
   {
     EL_EMERALD_PURPLE,				-1, GFX_ACTION_FALLING,
     IMG_EMERALD_PURPLE_FALLING