X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2g.c;h=6972e8439cc4c6acf6971287bfd759fb0957a213;hb=fa2a77aa4b53bb786e67f35d6c46f759ebe7823d;hp=de7c8a11bb34b0a1172bfae4a3c02f471f17045a;hpb=a84bd00a438ff458c2d74d1d1784deefe12bf84a;p=rocksndiamonds.git

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index de7c8a11..6972e843 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,
@@ -497,13 +509,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 +532,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 +549,7 @@ element_to_graphic[] =
     IMG_NUT
   },
   {
-    EL_NUT,					-1, GFX_ACTION_CRACKING,
+    EL_NUT_CRACKING,				-1, GFX_ACTION_CRACKING,
     IMG_NUT_CRACKING
   },
   {
@@ -620,6 +644,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 +721,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,
@@ -709,7 +737,7 @@ element_to_graphic[] =
     IMG_AMOEBA_CREATING
   },
   {
-    EL_AMOEBA_SHRINKING,			-1, -1,
+    EL_AMOEBA_SHRINKING,			-1, GFX_ACTION_SHRINKING,
     IMG_AMOEBA_SHRINKING
   },
   {
@@ -845,7 +873,7 @@ element_to_graphic[] =
     IMG_EXIT_CLOSED
   },
   {
-    EL_EXIT_OPENING,				-1, -1,
+    EL_EXIT_OPENING,				-1, GFX_ACTION_OPENING,
     IMG_EXIT_OPENING
   },
   {
@@ -885,7 +913,7 @@ element_to_graphic[] =
     IMG_SPRING
   },
   {
-    EL_SPRING_MOVING,				-1, -1,
+    EL_SPRING,					-1, GFX_ACTION_MOVING,
     IMG_SPRING_MOVING
   },
   {
@@ -1173,7 +1201,7 @@ element_to_graphic[] =
     IMG_SWITCHGATE_CLOSED
   },
   {
-    EL_SWITCHGATE_OPENING,			-1, -1,
+    EL_SWITCHGATE_OPENING,			-1, GFX_ACTION_OPENING,
     IMG_SWITCHGATE_OPENING
   },
   {
@@ -1181,7 +1209,7 @@ element_to_graphic[] =
     IMG_SWITCHGATE_OPEN
   },
   {
-    EL_SWITCHGATE_CLOSING,			-1, -1,
+    EL_SWITCHGATE_CLOSING,			-1, GFX_ACTION_CLOSING,
     IMG_SWITCHGATE_CLOSING
   },
   {
@@ -1189,7 +1217,7 @@ element_to_graphic[] =
     IMG_TIMEGATE_CLOSED
   },
   {
-    EL_TIMEGATE_OPENING,			-1, -1,
+    EL_TIMEGATE_OPENING,			-1, GFX_ACTION_OPENING,
     IMG_TIMEGATE_OPENING
   },
   {
@@ -1197,7 +1225,7 @@ element_to_graphic[] =
     IMG_TIMEGATE_OPEN
   },
   {
-    EL_TIMEGATE_CLOSING,			-1, -1,
+    EL_TIMEGATE_CLOSING,			-1, GFX_ACTION_CLOSING,
     IMG_TIMEGATE_CLOSING
   },
   {
@@ -1205,7 +1233,7 @@ element_to_graphic[] =
     IMG_PEARL
   },
   {
-    EL_PEARL_BREAKING,				-1, -1,
+    EL_PEARL_BREAKING,				-1, GFX_ACTION_BREAKING,
     IMG_PEARL_BREAKING
   },
   {
@@ -1420,6 +1448,10 @@ element_to_graphic[] =
     EL_WALL_BD_DIAMOND,				-1, -1,
     IMG_WALL_BD_DIAMOND
   },
+  {
+    EL_WALL_GROWING,				-1, -1,
+    IMG_WALL_GROWING
+  },
   {
     EL_WALL_GROWING_XY,				-1, -1,
     IMG_WALL_GROWING_XY
@@ -1492,6 +1524,10 @@ element_to_graphic[] =
     EL_DYNABOMB_XL,				-1, -1,
     IMG_DYNABOMB_XL
   },
+  {
+    EL_PIG,					-1, -1,
+    IMG_PIG
+  },
   {
     EL_PIG,					MV_DOWN, -1,
     IMG_PIG_DOWN
@@ -1540,6 +1576,10 @@ element_to_graphic[] =
     EL_PIG,					MV_RIGHT, GFX_ACTION_EATING,
     IMG_PIG_RIGHT_EATING
   },
+  {
+    EL_DRAGON,					-1, -1,
+    IMG_DRAGON
+  },
   {
     EL_DRAGON,					MV_DOWN, -1,
     IMG_DRAGON_DOWN
@@ -1588,6 +1628,10 @@ element_to_graphic[] =
     EL_DRAGON,					MV_RIGHT, GFX_ACTION_ATTACKING,
     IMG_DRAGON_RIGHT_ATTACKING
   },
+  {
+    EL_MOLE,					-1, -1,
+    IMG_MOLE
+  },
   {
     EL_MOLE_DOWN,				-1, -1,
     IMG_MOLE_DOWN
@@ -1684,6 +1728,10 @@ element_to_graphic[] =
     EL_MOLE,					MV_RIGHT, GFX_ACTION_DIGGING,
     IMG_MOLE_RIGHT_DIGGING
   },
+  {
+    EL_PENGUIN,					-1, -1,
+    IMG_PENGUIN
+  },
   {
     EL_PENGUIN,					MV_DOWN, -1,
     IMG_PENGUIN_DOWN
@@ -2148,10 +2196,6 @@ element_to_graphic[] =
     EL_ARROW_RED_DOWN,				-1, -1,
     IMG_ARROW_RED_DOWN
   },
-  {
-    EL_CHAR_QUESTION,				-1, -1,
-    IMG_CHAR_QUESTION
-  },
   {
     EL_DOOR_WHITE,				-1, -1,
     IMG_CHAR_QUESTION
@@ -2234,4 +2278,4 @@ element_to_graphic[] =
   },
 };
 
-#endif	/* GFX_LIST_H */
+#endif	/* CONF_E2G_C */