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

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index 1336e543..af01c278 100644
--- a/src/conf_e2g.c
+++ b/src/conf_e2g.c
@@ -16,11 +16,14 @@
 #ifndef CONF_E2G_C
 #define CONF_E2G_C
 
-/* values for element/graphics configuration */
+/* values for element/graphics mapping configuration */
 
 static struct
 {
     int element;
+    int direction;
+    int action;
+
     int graphic;
 }
 element_to_graphic[] =
@@ -38,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
@@ -186,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,
@@ -421,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
@@ -494,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
@@ -509,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
@@ -522,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
   },
   {
@@ -617,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
@@ -690,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,
@@ -706,20 +753,72 @@ element_to_graphic[] =
     IMG_AMOEBA_CREATING
   },
   {
-    EL_AMOEBA_PART1,				-1, -1,
-    IMG_AMOEBA_PART1
+    EL_AMOEBA_SHRINKING,			-1, -1,
+    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_DRY_PART1,			-1, -1,
+    IMG_AMOEBA_DRY_PART1
+  },
+  {
+    EL_AMOEBA_DRY_PART2,			-1, -1,
+    IMG_AMOEBA_DRY_PART2
+  },
+  {
+    EL_AMOEBA_DRY_PART3,			-1, -1,
+    IMG_AMOEBA_DRY_PART3
+  },
+  {
+    EL_AMOEBA_DRY_PART4,			-1, -1,
+    IMG_AMOEBA_DRY_PART4
   },
   {
-    EL_AMOEBA_PART2,				-1, -1,
-    IMG_AMOEBA_PART2
+    EL_AMOEBA_FULL,				-1, -1,
+    IMG_AMOEBA_FULL
   },
   {
-    EL_AMOEBA_PART3,				-1, -1,
-    IMG_AMOEBA_PART3
+    EL_AMOEBA_FULL,				-1, GFX_ACTION_OTHER,
+    IMG_AMOEBA_FULL_PART1
   },
   {
-    EL_AMOEBA_PART4,				-1, -1,
-    IMG_AMOEBA_PART4
+    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,
@@ -830,7 +929,7 @@ element_to_graphic[] =
     IMG_SPRING
   },
   {
-    EL_SPRING_MOVING,				-1, -1,
+    EL_SPRING,					-1, GFX_ACTION_MOVING,
     IMG_SPRING_MOVING
   },
   {
@@ -1329,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
@@ -1337,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
@@ -1345,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
@@ -1365,6 +1476,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
@@ -1437,6 +1552,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
@@ -1485,6 +1604,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
@@ -1533,6 +1656,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
@@ -1629,6 +1756,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
@@ -2093,10 +2224,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
@@ -2179,4 +2306,4 @@ element_to_graphic[] =
   },
 };
 
-#endif	/* GFX_LIST_H */
+#endif	/* CONF_E2G_C */