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

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index 491ed8f8..f2aaf759 100644
--- a/src/conf_e2g.c
+++ b/src/conf_e2g.c
@@ -205,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
@@ -257,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
@@ -265,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
@@ -689,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
@@ -869,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
@@ -1057,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
@@ -1701,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
@@ -2673,6 +2809,22 @@ 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_EMC_KEY_5,			-1, -1, FALSE,
     IMG_EMC_KEY_5
@@ -2693,38 +2845,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
@@ -2777,6 +2993,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
@@ -2793,6 +3013,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
@@ -2869,6 +3093,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
@@ -2877,6 +3105,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
@@ -2885,6 +3117,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