X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2g.c;h=7dd322fc7f5c0b4fb42a5524cbea6cffdc323650;hb=73dd81c85be90e466493bcc6f45c402d29bc7f20;hp=40e0b170dd86d0b827862c251aa779a7565f2ae9;hpb=66a22ebb170de96a59c015e49b15d95419fd87ae;p=rocksndiamonds.git

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index 40e0b170..7dd322fc 100644
--- a/src/conf_e2g.c
+++ b/src/conf_e2g.c
@@ -109,74 +109,10 @@ 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
@@ -389,6 +325,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
@@ -517,6 +485,10 @@ element_to_graphic[] =
     EL_SOKOBAN_FIELD_FULL,		-1, -1, FALSE,
     IMG_SOKOBAN_FIELD_FULL
   },
+  {
+    EL_SOKOBAN_FIELD_PLAYER,		-1, -1, FALSE,
+    IMG_SOKOBAN_FIELD_PLAYER
+  },
   {
     EL_EMPTY_SPACE,			-1, -1, FALSE,
     IMG_EMPTY_SPACE
@@ -713,6 +685,38 @@ element_to_graphic[] =
     EL_BUG,				ACTION_MOVING, MV_BIT_DOWN, FALSE,
     IMG_BUG_MOVING_DOWN
   },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_RIGHT, MV_BIT_UP, FALSE,
+    IMG_BUG_TURNING_FROM_RIGHT_UP
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_UP, MV_BIT_LEFT, FALSE,
+    IMG_BUG_TURNING_FROM_UP_LEFT
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_LEFT, MV_BIT_DOWN, FALSE,
+    IMG_BUG_TURNING_FROM_LEFT_DOWN
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_DOWN, MV_BIT_RIGHT, FALSE,
+    IMG_BUG_TURNING_FROM_DOWN_RIGHT
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_RIGHT, MV_BIT_DOWN, FALSE,
+    IMG_BUG_TURNING_FROM_RIGHT_DOWN
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_UP, MV_BIT_RIGHT, FALSE,
+    IMG_BUG_TURNING_FROM_UP_RIGHT
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_LEFT, MV_BIT_UP, FALSE,
+    IMG_BUG_TURNING_FROM_LEFT_UP
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_DOWN, MV_BIT_LEFT, FALSE,
+    IMG_BUG_TURNING_FROM_DOWN_LEFT
+  },
   {
     EL_SPACESHIP,			-1, -1, FALSE,
     IMG_SPACESHIP
@@ -917,10 +921,18 @@ element_to_graphic[] =
     EL_AMOEBA_GROWING,			-1, -1, FALSE,
     IMG_AMOEBA_GROWING
   },
+  {
+    EL_AMOEBA,				ACTION_GROWING, -1, FALSE,
+    IMG_AMOEBA_GROWING
+  },
   {
     EL_AMOEBA_SHRINKING,		-1, -1, FALSE,
     IMG_AMOEBA_SHRINKING
   },
+  {
+    EL_AMOEBA,				ACTION_SHRINKING, -1, FALSE,
+    IMG_AMOEBA_SHRINKING
+  },
   {
     EL_AMOEBA_WET,			-1, -1, FALSE,
     IMG_AMOEBA_WET
@@ -929,6 +941,10 @@ element_to_graphic[] =
     EL_AMOEBA_DROPPING,			-1, -1, FALSE,
     IMG_AMOEBA_DROPPING
   },
+  {
+    EL_AMOEBA,				ACTION_DROPPING, -1, FALSE,
+    IMG_AMOEBA_DROPPING
+  },
   {
     EL_AMOEBA_DRY,			-1, -1, FALSE,
     IMG_AMOEBA_DRY
@@ -2537,6 +2553,182 @@ element_to_graphic[] =
     EL_ARROW_DOWN,			-1, -1, FALSE,
     IMG_ARROW_DOWN
   },
+  {
+    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_BALLOON_SWITCH_NONE,		-1, -1, FALSE,
+    IMG_BALLOON_SWITCH_NONE
+  },
+  {
+    EL_EMC_ANDROID,			-1, -1, FALSE,
+    IMG_EMC_ANDROID
+  },
+  {
+    EL_EMC_GRASS,			-1, -1, FALSE,
+    IMG_EMC_GRASS
+  },
+  {
+    EL_EMC_MAGIC_BALL,			-1, -1, FALSE,
+    IMG_EMC_MAGIC_BALL
+  },
+  {
+    EL_EMC_MAGIC_BALL_SWITCH,		-1, -1, FALSE,
+    IMG_EMC_MAGIC_BALL_SWITCH
+  },
+  {
+    EL_EMC_GATE_5,			-1, -1, FALSE,
+    IMG_EMC_GATE_5
+  },
+  {
+    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_6_GRAY,			-1, -1, FALSE,
+    IMG_EMC_GATE_6_GRAY
+  },
+  {
+    EL_EMC_GATE_7,			-1, -1, FALSE,
+    IMG_EMC_GATE_7
+  },
+  {
+    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_8_GRAY,			-1, -1, FALSE,
+    IMG_EMC_GATE_8_GRAY
+  },
+  {
+    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_BUMPER,			-1, -1, FALSE,
+    IMG_EMC_BUMPER
+  },
+  {
+    EL_EMC_PLANT,			-1, -1, FALSE,
+    IMG_EMC_PLANT
+  },
+  {
+    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_BD_BUTTERFLY_DOWN,		-1, -1, FALSE,
+    IMG_BD_BUTTERFLY
+  },
+  {
+    EL_BD_BUTTERFLY_LEFT,		-1, -1, FALSE,
+    IMG_BD_BUTTERFLY
+  },
+  {
+    EL_BD_BUTTERFLY_RIGHT,		-1, -1, FALSE,
+    IMG_BD_BUTTERFLY
+  },
+  {
+    EL_BD_BUTTERFLY_UP,			-1, -1, FALSE,
+    IMG_BD_BUTTERFLY
+  },
+  {
+    EL_BD_FIREFLY_DOWN,			-1, -1, FALSE,
+    IMG_BD_FIREFLY
+  },
+  {
+    EL_BD_FIREFLY_LEFT,			-1, -1, FALSE,
+    IMG_BD_FIREFLY
+  },
+  {
+    EL_BD_FIREFLY_RIGHT,		-1, -1, FALSE,
+    IMG_BD_FIREFLY
+  },
+  {
+    EL_BD_FIREFLY_UP,			-1, -1, FALSE,
+    IMG_BD_FIREFLY
+  },
   {
     EL_DOOR_WHITE,			-1, -1, FALSE,
     IMG_CHAR_QUESTION
@@ -3905,6 +4097,134 @@ element_to_graphic[] =
     EL_CUSTOM_256,			-1, -1, FALSE,
     IMG_CUSTOM_256
   },
+  {
+    EL_GROUP_1,				-1, -1, FALSE,
+    IMG_GROUP_1
+  },
+  {
+    EL_GROUP_2,				-1, -1, FALSE,
+    IMG_GROUP_2
+  },
+  {
+    EL_GROUP_3,				-1, -1, FALSE,
+    IMG_GROUP_3
+  },
+  {
+    EL_GROUP_4,				-1, -1, FALSE,
+    IMG_GROUP_4
+  },
+  {
+    EL_GROUP_5,				-1, -1, FALSE,
+    IMG_GROUP_5
+  },
+  {
+    EL_GROUP_6,				-1, -1, FALSE,
+    IMG_GROUP_6
+  },
+  {
+    EL_GROUP_7,				-1, -1, FALSE,
+    IMG_GROUP_7
+  },
+  {
+    EL_GROUP_8,				-1, -1, FALSE,
+    IMG_GROUP_8
+  },
+  {
+    EL_GROUP_9,				-1, -1, FALSE,
+    IMG_GROUP_9
+  },
+  {
+    EL_GROUP_10,			-1, -1, FALSE,
+    IMG_GROUP_10
+  },
+  {
+    EL_GROUP_11,			-1, -1, FALSE,
+    IMG_GROUP_11
+  },
+  {
+    EL_GROUP_12,			-1, -1, FALSE,
+    IMG_GROUP_12
+  },
+  {
+    EL_GROUP_13,			-1, -1, FALSE,
+    IMG_GROUP_13
+  },
+  {
+    EL_GROUP_14,			-1, -1, FALSE,
+    IMG_GROUP_14
+  },
+  {
+    EL_GROUP_15,			-1, -1, FALSE,
+    IMG_GROUP_15
+  },
+  {
+    EL_GROUP_16,			-1, -1, FALSE,
+    IMG_GROUP_16
+  },
+  {
+    EL_GROUP_17,			-1, -1, FALSE,
+    IMG_GROUP_17
+  },
+  {
+    EL_GROUP_18,			-1, -1, FALSE,
+    IMG_GROUP_18
+  },
+  {
+    EL_GROUP_19,			-1, -1, FALSE,
+    IMG_GROUP_19
+  },
+  {
+    EL_GROUP_20,			-1, -1, FALSE,
+    IMG_GROUP_20
+  },
+  {
+    EL_GROUP_21,			-1, -1, FALSE,
+    IMG_GROUP_21
+  },
+  {
+    EL_GROUP_22,			-1, -1, FALSE,
+    IMG_GROUP_22
+  },
+  {
+    EL_GROUP_23,			-1, -1, FALSE,
+    IMG_GROUP_23
+  },
+  {
+    EL_GROUP_24,			-1, -1, FALSE,
+    IMG_GROUP_24
+  },
+  {
+    EL_GROUP_25,			-1, -1, FALSE,
+    IMG_GROUP_25
+  },
+  {
+    EL_GROUP_26,			-1, -1, FALSE,
+    IMG_GROUP_26
+  },
+  {
+    EL_GROUP_27,			-1, -1, FALSE,
+    IMG_GROUP_27
+  },
+  {
+    EL_GROUP_28,			-1, -1, FALSE,
+    IMG_GROUP_28
+  },
+  {
+    EL_GROUP_29,			-1, -1, FALSE,
+    IMG_GROUP_29
+  },
+  {
+    EL_GROUP_30,			-1, -1, FALSE,
+    IMG_GROUP_30
+  },
+  {
+    EL_GROUP_31,			-1, -1, FALSE,
+    IMG_GROUP_31
+  },
+  {
+    EL_GROUP_32,			-1, -1, FALSE,
+    IMG_GROUP_32
+  },
   {
     -1,					-1, -1, FALSE,
     -1