X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2g.c;h=770bb2453f768ac00bd4f8f33ebbab57dae0dece;hb=88c9b68c44a16e7df62557b63cc7e86731e028c9;hp=491ed8f8018db703e91ae359bf8e041a6b4fc98d;hpb=c539dd123bcd931d2b78986903cd27ba87acbc6f;p=rocksndiamonds.git

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index 491ed8f8..770bb245 100644
--- a/src/conf_e2g.c
+++ b/src/conf_e2g.c
@@ -1057,18 +1057,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 +1733,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 +2737,10 @@ element_to_graphic[] =
     EL_TRIGGER_PLAYER,			-1, -1, FALSE,
     IMG_TRIGGER_PLAYER
   },
+  {
+    EL_TRIGGER_CE_VALUE,		-1, -1, FALSE,
+    IMG_TRIGGER_CE_VALUE
+  },
   {
     EL_EMC_KEY_5,			-1, -1, FALSE,
     IMG_EMC_KEY_5
@@ -2693,38 +2761,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 +2909,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 +2929,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 +3009,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 +3021,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 +3033,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