X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2g.c;h=795d21ef80295ccc59c885344e117f78779da82e;hb=c9735f4510c07f163fc103d61ba4e0d2010c2032;hp=332a0a006ec9f81a65fb068806c7d27b0779a8fb;hpb=7db0a9ae54a91806b66eb918f28309bb875e3b69;p=rocksndiamonds.git

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index 332a0a00..795d21ef 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,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, GFX_ACTION_CRACKING,
     IMG_NUT_CRACKING
   },
   {
@@ -620,6 +656,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 +733,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,20 +749,72 @@ element_to_graphic[] =
     IMG_AMOEBA_CREATING
   },
   {
-    EL_AMOEBA_PART1,				-1, -1,
-    IMG_AMOEBA_PART1
+    EL_AMOEBA_SHRINKING,			-1, GFX_ACTION_SHRINKING,
+    IMG_AMOEBA_SHRINKING
+  },
+  {
+    EL_AMOEBA_WET,				-1, -1,
+    IMG_AMOEBA_WET
+  },
+  {
+    EL_AMOEBA_WET_PART1,			-1, -1,
+    IMG_AMOEBA_WET_PART1
+  },
+  {
+    EL_AMOEBA_WET_PART2,			-1, -1,
+    IMG_AMOEBA_WET_PART2
+  },
+  {
+    EL_AMOEBA_WET_PART3,			-1, -1,
+    IMG_AMOEBA_WET_PART3
+  },
+  {
+    EL_AMOEBA_WET_PART4,			-1, -1,
+    IMG_AMOEBA_WET_PART4
+  },
+  {
+    EL_AMOEBA_DRY,				-1, -1,
+    IMG_AMOEBA_DRY
   },
   {
-    EL_AMOEBA_PART2,				-1, -1,
-    IMG_AMOEBA_PART2
+    EL_AMOEBA_DRY_PART1,			-1, -1,
+    IMG_AMOEBA_DRY_PART1
   },
   {
-    EL_AMOEBA_PART3,				-1, -1,
-    IMG_AMOEBA_PART3
+    EL_AMOEBA_DRY_PART2,			-1, -1,
+    IMG_AMOEBA_DRY_PART2
   },
   {
-    EL_AMOEBA_PART4,				-1, -1,
-    IMG_AMOEBA_PART4
+    EL_AMOEBA_DRY_PART3,			-1, -1,
+    IMG_AMOEBA_DRY_PART3
+  },
+  {
+    EL_AMOEBA_DRY_PART4,			-1, -1,
+    IMG_AMOEBA_DRY_PART4
+  },
+  {
+    EL_AMOEBA_FULL,				-1, -1,
+    IMG_AMOEBA_FULL
+  },
+  {
+    EL_AMOEBA_FULL,				-1, GFX_ACTION_OTHER,
+    IMG_AMOEBA_FULL_PART1
+  },
+  {
+    EL_AMOEBA_FULL,				-1, GFX_ACTION_OTHER,
+    IMG_AMOEBA_FULL_PART2
+  },
+  {
+    EL_AMOEBA_FULL,				-1, GFX_ACTION_OTHER,
+    IMG_AMOEBA_FULL_PART3
+  },
+  {
+    EL_AMOEBA_FULL,				-1, GFX_ACTION_OTHER,
+    IMG_AMOEBA_FULL_PART4
+  },
+  {
+    EL_AMOEBA_DEAD,				-1, -1,
+    IMG_AMOEBA_DEAD
   },
   {
     EL_AMOEBA_DEAD_PART1,			-1, -1,
@@ -793,7 +885,7 @@ element_to_graphic[] =
     IMG_EXIT_CLOSED
   },
   {
-    EL_EXIT_OPENING,				-1, -1,
+    EL_EXIT_OPENING,				-1, GFX_ACTION_OPENING,
     IMG_EXIT_OPENING
   },
   {
@@ -833,7 +925,7 @@ element_to_graphic[] =
     IMG_SPRING
   },
   {
-    EL_SPRING_MOVING,				-1, -1,
+    EL_SPRING,					-1, GFX_ACTION_MOVING,
     IMG_SPRING_MOVING
   },
   {
@@ -1121,7 +1213,7 @@ element_to_graphic[] =
     IMG_SWITCHGATE_CLOSED
   },
   {
-    EL_SWITCHGATE_OPENING,			-1, -1,
+    EL_SWITCHGATE_OPENING,			-1, GFX_ACTION_OPENING,
     IMG_SWITCHGATE_OPENING
   },
   {
@@ -1129,7 +1221,7 @@ element_to_graphic[] =
     IMG_SWITCHGATE_OPEN
   },
   {
-    EL_SWITCHGATE_CLOSING,			-1, -1,
+    EL_SWITCHGATE_CLOSING,			-1, GFX_ACTION_CLOSING,
     IMG_SWITCHGATE_CLOSING
   },
   {
@@ -1137,7 +1229,7 @@ element_to_graphic[] =
     IMG_TIMEGATE_CLOSED
   },
   {
-    EL_TIMEGATE_OPENING,			-1, -1,
+    EL_TIMEGATE_OPENING,			-1, GFX_ACTION_OPENING,
     IMG_TIMEGATE_OPENING
   },
   {
@@ -1145,7 +1237,7 @@ element_to_graphic[] =
     IMG_TIMEGATE_OPEN
   },
   {
-    EL_TIMEGATE_CLOSING,			-1, -1,
+    EL_TIMEGATE_CLOSING,			-1, GFX_ACTION_CLOSING,
     IMG_TIMEGATE_CLOSING
   },
   {
@@ -1153,7 +1245,7 @@ element_to_graphic[] =
     IMG_PEARL
   },
   {
-    EL_PEARL_BREAKING,				-1, -1,
+    EL_PEARL_BREAKING,				-1, GFX_ACTION_BREAKING,
     IMG_PEARL_BREAKING
   },
   {
@@ -1332,6 +1424,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
@@ -1340,6 +1436,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
@@ -1348,6 +1448,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
@@ -1368,6 +1472,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
@@ -1440,6 +1548,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
@@ -1488,6 +1600,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
@@ -1536,6 +1652,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
@@ -1632,6 +1752,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
@@ -2096,10 +2220,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
@@ -2182,4 +2302,4 @@ element_to_graphic[] =
   },
 };
 
-#endif	/* GFX_LIST_H */
+#endif	/* CONF_E2G_C */