X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2g.c;h=491ed8f8018db703e91ae359bf8e041a6b4fc98d;hb=bafa61706833e7bfe942c388471058749c20c79e;hp=2c25c61987bb3abb1e36585c8591cb6baf8e9ca5;hpb=9583e9c55b889974e0df9a8ca1930efdf29bda29;p=rocksndiamonds.git

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index 2c25c619..491ed8f8 100644
--- a/src/conf_e2g.c
+++ b/src/conf_e2g.c
@@ -109,10 +109,74 @@ element_to_graphic[] =
     EL_BD_BUTTERFLY,			-1, -1, FALSE,
     IMG_BD_BUTTERFLY
   },
+  {
+    EL_BD_BUTTERFLY_RIGHT,		-1, -1, FALSE,
+    IMG_BD_BUTTERFLY_RIGHT
+  },
+  {
+    EL_BD_BUTTERFLY,			-1, MV_BIT_RIGHT, FALSE,
+    IMG_BD_BUTTERFLY_RIGHT
+  },
+  {
+    EL_BD_BUTTERFLY_UP,			-1, -1, FALSE,
+    IMG_BD_BUTTERFLY_UP
+  },
+  {
+    EL_BD_BUTTERFLY,			-1, MV_BIT_UP, FALSE,
+    IMG_BD_BUTTERFLY_UP
+  },
+  {
+    EL_BD_BUTTERFLY_LEFT,		-1, -1, FALSE,
+    IMG_BD_BUTTERFLY_LEFT
+  },
+  {
+    EL_BD_BUTTERFLY,			-1, MV_BIT_LEFT, FALSE,
+    IMG_BD_BUTTERFLY_LEFT
+  },
+  {
+    EL_BD_BUTTERFLY_DOWN,		-1, -1, FALSE,
+    IMG_BD_BUTTERFLY_DOWN
+  },
+  {
+    EL_BD_BUTTERFLY,			-1, MV_BIT_DOWN, FALSE,
+    IMG_BD_BUTTERFLY_DOWN
+  },
   {
     EL_BD_FIREFLY,			-1, -1, FALSE,
     IMG_BD_FIREFLY
   },
+  {
+    EL_BD_FIREFLY_RIGHT,		-1, -1, FALSE,
+    IMG_BD_FIREFLY_RIGHT
+  },
+  {
+    EL_BD_FIREFLY,			-1, MV_BIT_RIGHT, FALSE,
+    IMG_BD_FIREFLY_RIGHT
+  },
+  {
+    EL_BD_FIREFLY_UP,			-1, -1, FALSE,
+    IMG_BD_FIREFLY_UP
+  },
+  {
+    EL_BD_FIREFLY,			-1, MV_BIT_UP, FALSE,
+    IMG_BD_FIREFLY_UP
+  },
+  {
+    EL_BD_FIREFLY_LEFT,			-1, -1, FALSE,
+    IMG_BD_FIREFLY_LEFT
+  },
+  {
+    EL_BD_FIREFLY,			-1, MV_BIT_LEFT, FALSE,
+    IMG_BD_FIREFLY_LEFT
+  },
+  {
+    EL_BD_FIREFLY_DOWN,			-1, -1, FALSE,
+    IMG_BD_FIREFLY_DOWN
+  },
+  {
+    EL_BD_FIREFLY,			-1, MV_BIT_DOWN, FALSE,
+    IMG_BD_FIREFLY_DOWN
+  },
   {
     EL_SP_DEFAULT,			ACTION_EXPLODING, -1, FALSE,
     IMG_SP_DEFAULT_EXPLODING
@@ -1053,6 +1117,10 @@ element_to_graphic[] =
     EL_BALLOON_SWITCH_ANY,		-1, -1, FALSE,
     IMG_BALLOON_SWITCH_ANY
   },
+  {
+    EL_BALLOON_SWITCH_NONE,		-1, -1, FALSE,
+    IMG_BALLOON_SWITCH_NONE
+  },
   {
     EL_SPRING,				-1, -1, FALSE,
     IMG_SPRING
@@ -1141,6 +1209,46 @@ element_to_graphic[] =
     EL_INVISIBLE_SAND,			ACTION_ACTIVE, -1, FALSE,
     IMG_INVISIBLE_SAND_ACTIVE
   },
+  {
+    EL_INVISIBLE_SAND,			ACTION_ACTIVE, -1, TRUE,
+    IMG_INVISIBLE_SAND_ACTIVE_CRUMBLED
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		-1, -1, TRUE,
+    IMG_INVISIBLE_SAND_ACTIVE_CRUMBLED
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_LEFT, FALSE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_LEFT
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_RIGHT, FALSE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_RIGHT
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_UP, FALSE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_UP
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_DOWN, FALSE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_DOWN
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_LEFT, TRUE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_LEFT_CRUMBLED
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_RIGHT, TRUE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_RIGHT_CRUMBLED
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_UP, TRUE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_UP_CRUMBLED
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_DOWN, TRUE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_DOWN_CRUMBLED
+  },
   {
     EL_CONVEYOR_BELT_1_MIDDLE,		-1, -1, FALSE,
     IMG_CONVEYOR_BELT_1_MIDDLE
@@ -2566,16 +2674,20 @@ element_to_graphic[] =
     IMG_TRIGGER_PLAYER
   },
   {
-    EL_BALLOON_SWITCH_NONE,		-1, -1, FALSE,
-    IMG_BALLOON_SWITCH_NONE
+    EL_EMC_KEY_5,			-1, -1, FALSE,
+    IMG_EMC_KEY_5
   },
   {
-    EL_EMC_ANDROID,			-1, -1, FALSE,
-    IMG_EMC_ANDROID
+    EL_EMC_KEY_6,			-1, -1, FALSE,
+    IMG_EMC_KEY_6
   },
   {
-    EL_EMC_GENERATOR_BALL,		-1, -1, FALSE,
-    IMG_EMC_GENERATOR_BALL
+    EL_EMC_KEY_7,			-1, -1, FALSE,
+    IMG_EMC_KEY_7
+  },
+  {
+    EL_EMC_KEY_8,			-1, -1, FALSE,
+    IMG_EMC_KEY_8
   },
   {
     EL_EMC_GATE_5,			-1, -1, FALSE,
@@ -2610,20 +2722,172 @@ element_to_graphic[] =
     IMG_EMC_GATE_8_GRAY
   },
   {
-    EL_EMC_KEY_5,			-1, -1, FALSE,
-    IMG_EMC_KEY_5
+    EL_EMC_ANDROID,			-1, -1, FALSE,
+    IMG_EMC_ANDROID
   },
   {
-    EL_EMC_KEY_6,			-1, -1, FALSE,
-    IMG_EMC_KEY_6
+    EL_EMC_GRASS,			-1, -1, FALSE,
+    IMG_EMC_GRASS
   },
   {
-    EL_EMC_KEY_7,			-1, -1, FALSE,
-    IMG_EMC_KEY_7
+    EL_EMC_GRASS,			-1, -1, TRUE,
+    IMG_EMC_GRASS_CRUMBLED
   },
   {
-    EL_EMC_KEY_8,			-1, -1, FALSE,
-    IMG_EMC_KEY_8
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_LEFT, FALSE,
+    IMG_EMC_GRASS_DIGGING_LEFT
+  },
+  {
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_RIGHT, FALSE,
+    IMG_EMC_GRASS_DIGGING_RIGHT
+  },
+  {
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_UP, FALSE,
+    IMG_EMC_GRASS_DIGGING_UP
+  },
+  {
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_DOWN, FALSE,
+    IMG_EMC_GRASS_DIGGING_DOWN
+  },
+  {
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_LEFT, TRUE,
+    IMG_EMC_GRASS_DIGGING_LEFT_CRUMBLED
+  },
+  {
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_RIGHT, TRUE,
+    IMG_EMC_GRASS_DIGGING_RIGHT_CRUMBLED
+  },
+  {
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_UP, TRUE,
+    IMG_EMC_GRASS_DIGGING_UP_CRUMBLED
+  },
+  {
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_DOWN, TRUE,
+    IMG_EMC_GRASS_DIGGING_DOWN_CRUMBLED
+  },
+  {
+    EL_EMC_MAGIC_BALL,			-1, -1, FALSE,
+    IMG_EMC_MAGIC_BALL
+  },
+  {
+    EL_EMC_MAGIC_BALL_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_MAGIC_BALL_ACTIVE
+  },
+  {
+    EL_EMC_MAGIC_BALL,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_MAGIC_BALL_ACTIVE
+  },
+  {
+    EL_EMC_MAGIC_BALL_SWITCH,		-1, -1, FALSE,
+    IMG_EMC_MAGIC_BALL_SWITCH
+  },
+  {
+    EL_EMC_MAGIC_BALL_SWITCH_ACTIVE,	-1, -1, FALSE,
+    IMG_EMC_MAGIC_BALL_SWITCH_ACTIVE
+  },
+  {
+    EL_EMC_MAGIC_BALL_SWITCH,		ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_MAGIC_BALL_SWITCH_ACTIVE
+  },
+  {
+    EL_EMC_SPRING_BUMPER,		-1, -1, FALSE,
+    IMG_EMC_SPRING_BUMPER
+  },
+  {
+    EL_EMC_SPRING_BUMPER,		ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_SPRING_BUMPER_ACTIVE
+  },
+  {
+    EL_EMC_PLANT,			-1, -1, FALSE,
+    IMG_EMC_PLANT
+  },
+  {
+    EL_EMC_PLANT,			-1, -1, TRUE,
+    IMG_EMC_PLANT_CRUMBLED
+  },
+  {
+    EL_EMC_LENSES,			-1, -1, FALSE,
+    IMG_EMC_LENSES
+  },
+  {
+    EL_EMC_MAGNIFIER,			-1, -1, FALSE,
+    IMG_EMC_MAGNIFIER
+  },
+  {
+    EL_EMC_WALL_9,			-1, -1, FALSE,
+    IMG_EMC_WALL_9
+  },
+  {
+    EL_EMC_WALL_10,			-1, -1, FALSE,
+    IMG_EMC_WALL_10
+  },
+  {
+    EL_EMC_WALL_11,			-1, -1, FALSE,
+    IMG_EMC_WALL_11
+  },
+  {
+    EL_EMC_WALL_12,			-1, -1, FALSE,
+    IMG_EMC_WALL_12
+  },
+  {
+    EL_EMC_WALL_13,			-1, -1, FALSE,
+    IMG_EMC_WALL_13
+  },
+  {
+    EL_EMC_WALL_14,			-1, -1, FALSE,
+    IMG_EMC_WALL_14
+  },
+  {
+    EL_EMC_WALL_15,			-1, -1, FALSE,
+    IMG_EMC_WALL_15
+  },
+  {
+    EL_EMC_WALL_16,			-1, -1, FALSE,
+    IMG_EMC_WALL_16
+  },
+  {
+    EL_EMC_WALL_SLIPPERY_1,		-1, -1, FALSE,
+    IMG_EMC_WALL_SLIPPERY_1
+  },
+  {
+    EL_EMC_WALL_SLIPPERY_2,		-1, -1, FALSE,
+    IMG_EMC_WALL_SLIPPERY_2
+  },
+  {
+    EL_EMC_WALL_SLIPPERY_3,		-1, -1, FALSE,
+    IMG_EMC_WALL_SLIPPERY_3
+  },
+  {
+    EL_EMC_WALL_SLIPPERY_4,		-1, -1, FALSE,
+    IMG_EMC_WALL_SLIPPERY_4
+  },
+  {
+    EL_EMC_FAKE_GRASS,			-1, -1, FALSE,
+    IMG_EMC_FAKE_GRASS
+  },
+  {
+    EL_EMC_FAKE_GRASS,			-1, -1, TRUE,
+    IMG_EMC_FAKE_GRASS_CRUMBLED
+  },
+  {
+    EL_EMC_FAKE_GRASS,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_FAKE_GRASS_ACTIVE
+  },
+  {
+    EL_EMC_FAKE_GRASS,			ACTION_ACTIVE, -1, TRUE,
+    IMG_EMC_FAKE_GRASS_ACTIVE_CRUMBLED
+  },
+  {
+    EL_EMC_FAKE_ACID,			-1, -1, FALSE,
+    IMG_EMC_FAKE_ACID
+  },
+  {
+    EL_EMC_DRIPPER,			-1, -1, FALSE,
+    IMG_EMC_DRIPPER
+  },
+  {
+    EL_EMC_DRIPPER,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_DRIPPER_ACTIVE
   },
   {
     EL_BD_BUTTERFLY_DOWN,		-1, -1, FALSE,
@@ -2738,8 +3002,8 @@ element_to_graphic[] =
     IMG_CHAR_DOLLAR
   },
   {
-    EL_CHAR_PROCENT,			-1, -1, FALSE,
-    IMG_CHAR_PROCENT
+    EL_CHAR_PERCENT,			-1, -1, FALSE,
+    IMG_CHAR_PERCENT
   },
   {
     EL_CHAR_AMPERSAND,			-1, -1, FALSE,