X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2g.c;h=9bd5f75154bd58ae98bc1c71d45250bdc4c221af;hb=e5a0a3097d6a6c3afea01b3deeee9b206982ec1d;hp=1bbae6db31acf28f735353521a7d43778511b922;hpb=ac0b7706bf6edba12ba74f9962ff2e617f9ad41a;p=rocksndiamonds.git

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index 1bbae6db..9bd5f751 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
@@ -325,6 +389,38 @@ element_to_graphic[] =
     EL_SP_GRAVITY_PORT_UP,		-1, -1, FALSE,
     IMG_SP_GRAVITY_PORT_UP
   },
+  {
+    EL_SP_GRAVITY_ON_PORT_RIGHT,	-1, -1, FALSE,
+    IMG_SP_GRAVITY_ON_PORT_RIGHT
+  },
+  {
+    EL_SP_GRAVITY_ON_PORT_DOWN,		-1, -1, FALSE,
+    IMG_SP_GRAVITY_ON_PORT_DOWN
+  },
+  {
+    EL_SP_GRAVITY_ON_PORT_LEFT,		-1, -1, FALSE,
+    IMG_SP_GRAVITY_ON_PORT_LEFT
+  },
+  {
+    EL_SP_GRAVITY_ON_PORT_UP,		-1, -1, FALSE,
+    IMG_SP_GRAVITY_ON_PORT_UP
+  },
+  {
+    EL_SP_GRAVITY_OFF_PORT_RIGHT,	-1, -1, FALSE,
+    IMG_SP_GRAVITY_OFF_PORT_RIGHT
+  },
+  {
+    EL_SP_GRAVITY_OFF_PORT_DOWN,	-1, -1, FALSE,
+    IMG_SP_GRAVITY_OFF_PORT_DOWN
+  },
+  {
+    EL_SP_GRAVITY_OFF_PORT_LEFT,	-1, -1, FALSE,
+    IMG_SP_GRAVITY_OFF_PORT_LEFT
+  },
+  {
+    EL_SP_GRAVITY_OFF_PORT_UP,		-1, -1, FALSE,
+    IMG_SP_GRAVITY_OFF_PORT_UP
+  },
   {
     EL_SP_SNIKSNAK,			-1, -1, FALSE,
     IMG_SP_SNIKSNAK
@@ -961,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
@@ -1021,6 +1149,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
@@ -1109,6 +1241,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
@@ -1561,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
@@ -2525,6 +2729,282 @@ element_to_graphic[] =
     EL_UNKNOWN,				-1, -1, FALSE,
     IMG_UNKNOWN
   },
+  {
+    EL_TRIGGER_ELEMENT,			-1, -1, FALSE,
+    IMG_TRIGGER_ELEMENT
+  },
+  {
+    EL_TRIGGER_PLAYER,			-1, -1, FALSE,
+    IMG_TRIGGER_PLAYER
+  },
+  {
+    EL_EMC_KEY_5,			-1, -1, FALSE,
+    IMG_EMC_KEY_5
+  },
+  {
+    EL_EMC_KEY_6,			-1, -1, FALSE,
+    IMG_EMC_KEY_6
+  },
+  {
+    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,
+    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_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_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_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_GRASS,			-1, -1, FALSE,
+    IMG_EMC_GRASS
+  },
+  {
+    EL_EMC_GRASS,			-1, -1, TRUE,
+    IMG_EMC_GRASS_CRUMBLED
+  },
+  {
+    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,			ACTION_DROPPING, -1, FALSE,
+    IMG_EMC_MAGIC_BALL_DROPPING
+  },
+  {
+    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_ACTIVE,	-1, -1, FALSE,
+    IMG_EMC_SPRING_BUMPER_ACTIVE
+  },
+  {
+    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_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_FAKE_GRASS_ACTIVE
+  },
+  {
+    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_GRASS_ACTIVE,		-1, -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_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_DRIPPER_ACTIVE
+  },
+  {
+    EL_EMC_DRIPPER,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_DRIPPER_ACTIVE
+  },
   {
     EL_BD_BUTTERFLY_DOWN,		-1, -1, FALSE,
     IMG_BD_BUTTERFLY
@@ -2638,8 +3118,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,