X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2g.c;h=d40c31b9473fac9cf8d93fc2de4bb8010ed500c1;hb=e4f31a4e6f4b611a1dddb16afb66e3af177dd937;hp=e98182ce520ce4d68c0e7ddb338bed4e63c76545;hpb=fa8a648dfc55b04e778c09b841b194099e1e5dfa;p=rocksndiamonds.git

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index e98182ce..d40c31b9 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
@@ -141,6 +205,14 @@ element_to_graphic[] =
     EL_SP_BASE,				-1, -1, FALSE,
     IMG_SP_BASE
   },
+  {
+    EL_SP_BASE,				ACTION_DIGGING, -1, FALSE,
+    IMG_SP_BASE_DIGGING
+  },
+  {
+    EL_SP_BASE,				ACTION_SNAPPING, -1, FALSE,
+    IMG_SP_BASE_SNAPPING
+  },
   {
     EL_SP_MURPHY,			-1, -1, FALSE,
     IMG_SP_MURPHY
@@ -193,6 +265,22 @@ element_to_graphic[] =
     EL_SP_MURPHY,			ACTION_SNAPPING, MV_BIT_DOWN, FALSE,
     IMG_SP_MURPHY_SNAPPING_DOWN
   },
+  {
+    EL_SP_MURPHY,			ACTION_BORING, -1, FALSE,
+    IMG_SP_MURPHY_BORING
+  },
+  {
+    EL_SP_MURPHY,			ACTION_BORING_1, -1, FALSE,
+    IMG_SP_MURPHY_BORING_1
+  },
+  {
+    EL_SP_MURPHY,			ACTION_SLEEPING, MV_BIT_LEFT, FALSE,
+    IMG_SP_MURPHY_SLEEPING_LEFT
+  },
+  {
+    EL_SP_MURPHY,			ACTION_SLEEPING, MV_BIT_RIGHT, FALSE,
+    IMG_SP_MURPHY_SLEEPING_RIGHT
+  },
   {
     EL_SP_MURPHY_CLONE,			-1, -1, FALSE,
     IMG_SP_MURPHY_CLONE
@@ -201,6 +289,10 @@ element_to_graphic[] =
     EL_SP_INFOTRON,			-1, -1, FALSE,
     IMG_SP_INFOTRON
   },
+  {
+    EL_SP_INFOTRON,			ACTION_COLLECTING, -1, FALSE,
+    IMG_SP_INFOTRON_COLLECTING
+  },
   {
     EL_SP_CHIP_SINGLE,			-1, -1, FALSE,
     IMG_SP_CHIP_SINGLE
@@ -625,6 +717,18 @@ element_to_graphic[] =
     EL_DYNAMITE,			ACTION_ACTIVE, -1, FALSE,
     IMG_DYNAMITE_ACTIVE
   },
+  {
+    EL_EM_DYNAMITE,			-1, -1, FALSE,
+    IMG_EM_DYNAMITE
+  },
+  {
+    EL_EM_DYNAMITE_ACTIVE,		-1, -1, FALSE,
+    IMG_EM_DYNAMITE_ACTIVE
+  },
+  {
+    EL_EM_DYNAMITE,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EM_DYNAMITE_ACTIVE
+  },
   {
     EL_WALL_EMERALD,			-1, -1, FALSE,
     IMG_WALL_EMERALD
@@ -805,6 +909,38 @@ element_to_graphic[] =
     EL_YAMYAM,				-1, -1, FALSE,
     IMG_YAMYAM
   },
+  {
+    EL_YAMYAM_LEFT,			-1, -1, FALSE,
+    IMG_YAMYAM_LEFT
+  },
+  {
+    EL_YAMYAM,				-1, MV_BIT_LEFT, FALSE,
+    IMG_YAMYAM_LEFT
+  },
+  {
+    EL_YAMYAM_RIGHT,			-1, -1, FALSE,
+    IMG_YAMYAM_RIGHT
+  },
+  {
+    EL_YAMYAM,				-1, MV_BIT_RIGHT, FALSE,
+    IMG_YAMYAM_RIGHT
+  },
+  {
+    EL_YAMYAM_UP,			-1, -1, FALSE,
+    IMG_YAMYAM_UP
+  },
+  {
+    EL_YAMYAM,				-1, MV_BIT_UP, FALSE,
+    IMG_YAMYAM_UP
+  },
+  {
+    EL_YAMYAM_DOWN,			-1, -1, FALSE,
+    IMG_YAMYAM_DOWN
+  },
+  {
+    EL_YAMYAM,				-1, MV_BIT_DOWN, FALSE,
+    IMG_YAMYAM_DOWN
+  },
   {
     EL_YAMYAM,				ACTION_MOVING, -1, FALSE,
     IMG_YAMYAM_MOVING
@@ -993,18 +1129,50 @@ element_to_graphic[] =
     EL_EM_GATE_1_GRAY,			-1, -1, FALSE,
     IMG_EM_GATE_1_GRAY
   },
+  {
+    EL_EM_GATE_1_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EM_GATE_1_GRAY_ACTIVE
+  },
+  {
+    EL_EM_GATE_1_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EM_GATE_1_GRAY_ACTIVE
+  },
   {
     EL_EM_GATE_2_GRAY,			-1, -1, FALSE,
     IMG_EM_GATE_2_GRAY
   },
+  {
+    EL_EM_GATE_2_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EM_GATE_2_GRAY_ACTIVE
+  },
+  {
+    EL_EM_GATE_2_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EM_GATE_2_GRAY_ACTIVE
+  },
   {
     EL_EM_GATE_3_GRAY,			-1, -1, FALSE,
     IMG_EM_GATE_3_GRAY
   },
+  {
+    EL_EM_GATE_3_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EM_GATE_3_GRAY_ACTIVE
+  },
+  {
+    EL_EM_GATE_3_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EM_GATE_3_GRAY_ACTIVE
+  },
   {
     EL_EM_GATE_4_GRAY,			-1, -1, FALSE,
     IMG_EM_GATE_4_GRAY
   },
+  {
+    EL_EM_GATE_4_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EM_GATE_4_GRAY_ACTIVE
+  },
+  {
+    EL_EM_GATE_4_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EM_GATE_4_GRAY_ACTIVE
+  },
   {
     EL_EXIT_CLOSED,			-1, -1, FALSE,
     IMG_EXIT_CLOSED
@@ -1637,18 +1805,50 @@ element_to_graphic[] =
     EL_GATE_1_GRAY,			-1, -1, FALSE,
     IMG_GATE_1_GRAY
   },
+  {
+    EL_GATE_1_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_GATE_1_GRAY_ACTIVE
+  },
+  {
+    EL_GATE_1_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_GATE_1_GRAY_ACTIVE
+  },
   {
     EL_GATE_2_GRAY,			-1, -1, FALSE,
     IMG_GATE_2_GRAY
   },
+  {
+    EL_GATE_2_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_GATE_2_GRAY_ACTIVE
+  },
+  {
+    EL_GATE_2_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_GATE_2_GRAY_ACTIVE
+  },
   {
     EL_GATE_3_GRAY,			-1, -1, FALSE,
     IMG_GATE_3_GRAY
   },
+  {
+    EL_GATE_3_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_GATE_3_GRAY_ACTIVE
+  },
+  {
+    EL_GATE_3_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_GATE_3_GRAY_ACTIVE
+  },
   {
     EL_GATE_4_GRAY,			-1, -1, FALSE,
     IMG_GATE_4_GRAY
   },
+  {
+    EL_GATE_4_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_GATE_4_GRAY_ACTIVE
+  },
+  {
+    EL_GATE_4_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_GATE_4_GRAY_ACTIVE
+  },
   {
     EL_GAME_OF_LIFE,			-1, -1, FALSE,
     IMG_GAME_OF_LIFE
@@ -1797,6 +1997,10 @@ element_to_graphic[] =
     EL_EXPANDABLE_WALL_ANY,		-1, -1, FALSE,
     IMG_EXPANDABLE_WALL_ANY
   },
+  {
+    EL_BD_EXPANDABLE_WALL,		-1, -1, FALSE,
+    IMG_BD_EXPANDABLE_WALL
+  },
   {
     EL_EXPANDABLE_WALL,			ACTION_GROWING, MV_BIT_LEFT, FALSE,
     IMG_EXPANDABLE_WALL_GROWING_LEFT
@@ -2609,6 +2813,94 @@ element_to_graphic[] =
     EL_TRIGGER_PLAYER,			-1, -1, FALSE,
     IMG_TRIGGER_PLAYER
   },
+  {
+    EL_TRIGGER_CE_VALUE,		-1, -1, FALSE,
+    IMG_TRIGGER_CE_VALUE
+  },
+  {
+    EL_TRIGGER_CE_SCORE,		-1, -1, FALSE,
+    IMG_TRIGGER_CE_SCORE
+  },
+  {
+    EL_CURRENT_CE_VALUE,		-1, -1, FALSE,
+    IMG_CURRENT_CE_VALUE
+  },
+  {
+    EL_CURRENT_CE_SCORE,		-1, -1, FALSE,
+    IMG_CURRENT_CE_SCORE
+  },
+  {
+    EL_LAST_CE_1,			-1, -1, FALSE,
+    IMG_LAST_CE_1
+  },
+  {
+    EL_LAST_CE_2,			-1, -1, FALSE,
+    IMG_LAST_CE_2
+  },
+  {
+    EL_LAST_CE_3,			-1, -1, FALSE,
+    IMG_LAST_CE_3
+  },
+  {
+    EL_LAST_CE_4,			-1, -1, FALSE,
+    IMG_LAST_CE_4
+  },
+  {
+    EL_LAST_CE_5,			-1, -1, FALSE,
+    IMG_LAST_CE_5
+  },
+  {
+    EL_LAST_CE_6,			-1, -1, FALSE,
+    IMG_LAST_CE_6
+  },
+  {
+    EL_LAST_CE_7,			-1, -1, FALSE,
+    IMG_LAST_CE_7
+  },
+  {
+    EL_LAST_CE_8,			-1, -1, FALSE,
+    IMG_LAST_CE_8
+  },
+  {
+    EL_NEXT_CE_1,			-1, -1, FALSE,
+    IMG_NEXT_CE_1
+  },
+  {
+    EL_NEXT_CE_2,			-1, -1, FALSE,
+    IMG_NEXT_CE_2
+  },
+  {
+    EL_NEXT_CE_3,			-1, -1, FALSE,
+    IMG_NEXT_CE_3
+  },
+  {
+    EL_NEXT_CE_4,			-1, -1, FALSE,
+    IMG_NEXT_CE_4
+  },
+  {
+    EL_NEXT_CE_5,			-1, -1, FALSE,
+    IMG_NEXT_CE_5
+  },
+  {
+    EL_NEXT_CE_6,			-1, -1, FALSE,
+    IMG_NEXT_CE_6
+  },
+  {
+    EL_NEXT_CE_7,			-1, -1, FALSE,
+    IMG_NEXT_CE_7
+  },
+  {
+    EL_NEXT_CE_8,			-1, -1, FALSE,
+    IMG_NEXT_CE_8
+  },
+  {
+    EL_SELF,				-1, -1, FALSE,
+    IMG_SELF
+  },
+  {
+    EL_ANY_ELEMENT,			-1, -1, FALSE,
+    IMG_ANY_ELEMENT
+  },
   {
     EL_EMC_KEY_5,			-1, -1, FALSE,
     IMG_EMC_KEY_5
@@ -2629,38 +2921,102 @@ element_to_graphic[] =
     EL_EMC_GATE_5,			-1, -1, FALSE,
     IMG_EMC_GATE_5
   },
+  {
+    EL_EMC_GATE_6,			-1, -1, FALSE,
+    IMG_EMC_GATE_6
+  },
+  {
+    EL_EMC_GATE_7,			-1, -1, FALSE,
+    IMG_EMC_GATE_7
+  },
+  {
+    EL_EMC_GATE_8,			-1, -1, FALSE,
+    IMG_EMC_GATE_8
+  },
   {
     EL_EMC_GATE_5_GRAY,			-1, -1, FALSE,
     IMG_EMC_GATE_5_GRAY
   },
   {
-    EL_EMC_GATE_6,			-1, -1, FALSE,
-    IMG_EMC_GATE_6
+    EL_EMC_GATE_5_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_GATE_5_GRAY_ACTIVE
+  },
+  {
+    EL_EMC_GATE_5_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_GATE_5_GRAY_ACTIVE
   },
   {
     EL_EMC_GATE_6_GRAY,			-1, -1, FALSE,
     IMG_EMC_GATE_6_GRAY
   },
   {
-    EL_EMC_GATE_7,			-1, -1, FALSE,
-    IMG_EMC_GATE_7
+    EL_EMC_GATE_6_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_GATE_6_GRAY_ACTIVE
+  },
+  {
+    EL_EMC_GATE_6_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_GATE_6_GRAY_ACTIVE
   },
   {
     EL_EMC_GATE_7_GRAY,			-1, -1, FALSE,
     IMG_EMC_GATE_7_GRAY
   },
   {
-    EL_EMC_GATE_8,			-1, -1, FALSE,
-    IMG_EMC_GATE_8
+    EL_EMC_GATE_7_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_GATE_7_GRAY_ACTIVE
+  },
+  {
+    EL_EMC_GATE_7_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_GATE_7_GRAY_ACTIVE
   },
   {
     EL_EMC_GATE_8_GRAY,			-1, -1, FALSE,
     IMG_EMC_GATE_8_GRAY
   },
+  {
+    EL_EMC_GATE_8_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_GATE_8_GRAY_ACTIVE
+  },
+  {
+    EL_EMC_GATE_8_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_GATE_8_GRAY_ACTIVE
+  },
   {
     EL_EMC_ANDROID,			-1, -1, FALSE,
     IMG_EMC_ANDROID
   },
+  {
+    EL_EMC_ANDROID,			ACTION_SHRINKING, MV_BIT_UPLEFT, FALSE,
+    IMG_EMC_ANDROID_SHRINKING_UPLEFT
+  },
+  {
+    EL_EMC_ANDROID,			ACTION_GROWING, MV_BIT_DOWNRIGHT, FALSE,
+    IMG_EMC_ANDROID_GROWING_DOWNRIGHT
+  },
+  {
+    EL_EMC_ANDROID,			ACTION_SHRINKING, MV_BIT_DOWNLEFT, FALSE,
+    IMG_EMC_ANDROID_SHRINKING_DOWNLEFT
+  },
+  {
+    EL_EMC_ANDROID,			ACTION_GROWING, MV_BIT_UPRIGHT, FALSE,
+    IMG_EMC_ANDROID_GROWING_UPRIGHT
+  },
+  {
+    EL_EMC_ANDROID,			ACTION_SHRINKING, MV_BIT_UPRIGHT, FALSE,
+    IMG_EMC_ANDROID_SHRINKING_UPRIGHT
+  },
+  {
+    EL_EMC_ANDROID,			ACTION_GROWING, MV_BIT_DOWNLEFT, FALSE,
+    IMG_EMC_ANDROID_GROWING_DOWNLEFT
+  },
+  {
+    EL_EMC_ANDROID,			ACTION_SHRINKING, MV_BIT_DOWNRIGHT, FALSE,
+    IMG_EMC_ANDROID_SHRINKING_DOWNRIGHT
+  },
+  {
+    EL_EMC_ANDROID,			ACTION_GROWING, MV_BIT_UPLEFT, FALSE,
+    IMG_EMC_ANDROID_GROWING_UPLEFT
+  },
   {
     EL_EMC_GRASS,			-1, -1, FALSE,
     IMG_EMC_GRASS
@@ -2713,6 +3069,10 @@ element_to_graphic[] =
     EL_EMC_MAGIC_BALL,			ACTION_ACTIVE, -1, FALSE,
     IMG_EMC_MAGIC_BALL_ACTIVE
   },
+  {
+    EL_EMC_MAGIC_BALL,			ACTION_DROPPING, -1, FALSE,
+    IMG_EMC_MAGIC_BALL_DROPPING
+  },
   {
     EL_EMC_MAGIC_BALL_SWITCH,		-1, -1, FALSE,
     IMG_EMC_MAGIC_BALL_SWITCH
@@ -2729,6 +3089,10 @@ element_to_graphic[] =
     EL_EMC_SPRING_BUMPER,		-1, -1, FALSE,
     IMG_EMC_SPRING_BUMPER
   },
+  {
+    EL_EMC_SPRING_BUMPER_ACTIVE,	-1, -1, FALSE,
+    IMG_EMC_SPRING_BUMPER_ACTIVE
+  },
   {
     EL_EMC_SPRING_BUMPER,		ACTION_ACTIVE, -1, FALSE,
     IMG_EMC_SPRING_BUMPER_ACTIVE
@@ -2805,6 +3169,10 @@ element_to_graphic[] =
     EL_EMC_FAKE_GRASS,			-1, -1, TRUE,
     IMG_EMC_FAKE_GRASS_CRUMBLED
   },
+  {
+    EL_EMC_FAKE_GRASS_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_FAKE_GRASS_ACTIVE
+  },
   {
     EL_EMC_FAKE_GRASS,			ACTION_ACTIVE, -1, FALSE,
     IMG_EMC_FAKE_GRASS_ACTIVE
@@ -2813,6 +3181,10 @@ element_to_graphic[] =
     EL_EMC_FAKE_GRASS,			ACTION_ACTIVE, -1, TRUE,
     IMG_EMC_FAKE_GRASS_ACTIVE_CRUMBLED
   },
+  {
+    EL_EMC_FAKE_GRASS_ACTIVE,		-1, -1, TRUE,
+    IMG_EMC_FAKE_GRASS_ACTIVE_CRUMBLED
+  },
   {
     EL_EMC_FAKE_ACID,			-1, -1, FALSE,
     IMG_EMC_FAKE_ACID
@@ -2821,6 +3193,10 @@ element_to_graphic[] =
     EL_EMC_DRIPPER,			-1, -1, FALSE,
     IMG_EMC_DRIPPER
   },
+  {
+    EL_EMC_DRIPPER_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_DRIPPER_ACTIVE
+  },
   {
     EL_EMC_DRIPPER,			ACTION_ACTIVE, -1, FALSE,
     IMG_EMC_DRIPPER_ACTIVE