rnd-20030305-1-src
[rocksndiamonds.git] / src / conf_e2g.c
index 265abda23f5eddc8e1be47fcdcf4cdf7f7064880..dd31ede8765f40eabb31af9aff77a856f31f8d46 100644 (file)
 
 static struct
 {
-    int element;
-    int action;
-    int direction;
+  int element;
+  int action;
+  int direction;
 
-    int graphic;
+  int graphic;
 }
 element_to_graphic[] =
 {
@@ -76,6 +76,10 @@ element_to_graphic[] =
     EL_BD_MAGIC_WALL_FILLING,                  -1, -1,
     IMG_BD_MAGIC_WALL_FILLING
   },
+  {
+    EL_BD_MAGIC_WALL,                          ACTION_FILLING, -1,
+    IMG_BD_MAGIC_WALL_FILLING
+  },
   {
     EL_BD_MAGIC_WALL_FULL,                     -1, -1,
     IMG_BD_MAGIC_WALL_FULL
@@ -84,6 +88,10 @@ element_to_graphic[] =
     EL_BD_MAGIC_WALL_EMPTYING,                 -1, -1,
     IMG_BD_MAGIC_WALL_EMPTYING
   },
+  {
+    EL_BD_MAGIC_WALL,                          ACTION_EMPTYING, -1,
+    IMG_BD_MAGIC_WALL_EMPTYING
+  },
   {
     EL_BD_MAGIC_WALL_DEAD,                     -1, -1,
     IMG_BD_MAGIC_WALL_DEAD
@@ -172,10 +180,6 @@ element_to_graphic[] =
     EL_BD_FIREFLY,                             ACTION_MOVING, -1,
     IMG_BD_FIREFLY_MOVING
   },
-  {
-    EL_SP_EMPTY_SPACE,                         -1, -1,
-    IMG_SP_EMPTY_SPACE
-  },
   {
     EL_SP_ZONK,                                        -1, -1,
     IMG_SP_ZONK
@@ -265,32 +269,32 @@ element_to_graphic[] =
     IMG_SP_CHIP_RIGHT
   },
   {
-    EL_SP_CHIP_UPPER,                          -1, -1,
-    IMG_SP_CHIP_UPPER
+    EL_SP_CHIP_TOP,                            -1, -1,
+    IMG_SP_CHIP_TOP
   },
   {
-    EL_SP_CHIP_LOWER,                          -1, -1,
-    IMG_SP_CHIP_LOWER
+    EL_SP_CHIP_BOTTOM,                         -1, -1,
+    IMG_SP_CHIP_BOTTOM
   },
   {
-    EL_SP_HARD_GRAY,                           -1, -1,
-    IMG_SP_HARD_GRAY
+    EL_SP_HARDWARE_GRAY,                       -1, -1,
+    IMG_SP_HARDWARE_GRAY
   },
   {
-    EL_SP_HARD_GREEN,                          -1, -1,
-    IMG_SP_HARD_GREEN
+    EL_SP_HARDWARE_GREEN,                      -1, -1,
+    IMG_SP_HARDWARE_GREEN
   },
   {
-    EL_SP_HARD_BLUE,                           -1, -1,
-    IMG_SP_HARD_BLUE
+    EL_SP_HARDWARE_BLUE,                       -1, -1,
+    IMG_SP_HARDWARE_BLUE
   },
   {
-    EL_SP_HARD_RED,                            -1, -1,
-    IMG_SP_HARD_RED
+    EL_SP_HARDWARE_RED,                                -1, -1,
+    IMG_SP_HARDWARE_RED
   },
   {
-    EL_SP_HARD_YELLOW,                         -1, -1,
-    IMG_SP_HARD_YELLOW
+    EL_SP_HARDWARE_YELLOW,                     -1, -1,
+    IMG_SP_HARDWARE_YELLOW
   },
   {
     EL_SP_EXIT_CLOSED,                         -1, -1,
@@ -337,48 +341,48 @@ element_to_graphic[] =
     IMG_SP_DISK_RED_ACTIVE
   },
   {
-    EL_SP_PORT1_RIGHT,                         -1, -1,
-    IMG_SP_PORT1_RIGHT
+    EL_SP_PORT_RIGHT,                          -1, -1,
+    IMG_SP_PORT_RIGHT
   },
   {
-    EL_SP_PORT1_DOWN,                          -1, -1,
-    IMG_SP_PORT1_DOWN
+    EL_SP_PORT_DOWN,                           -1, -1,
+    IMG_SP_PORT_DOWN
   },
   {
-    EL_SP_PORT1_LEFT,                          -1, -1,
-    IMG_SP_PORT1_LEFT
+    EL_SP_PORT_LEFT,                           -1, -1,
+    IMG_SP_PORT_LEFT
   },
   {
-    EL_SP_PORT1_UP,                            -1, -1,
-    IMG_SP_PORT1_UP
+    EL_SP_PORT_UP,                             -1, -1,
+    IMG_SP_PORT_UP
   },
   {
-    EL_SP_PORT2_RIGHT,                         -1, -1,
-    IMG_SP_PORT2_RIGHT
+    EL_SP_PORT_HORIZONTAL,                     -1, -1,
+    IMG_SP_PORT_HORIZONTAL
   },
   {
-    EL_SP_PORT2_DOWN,                          -1, -1,
-    IMG_SP_PORT2_DOWN
+    EL_SP_PORT_VERTICAL,                       -1, -1,
+    IMG_SP_PORT_VERTICAL
   },
   {
-    EL_SP_PORT2_LEFT,                          -1, -1,
-    IMG_SP_PORT2_LEFT
+    EL_SP_PORT_ANY,                            -1, -1,
+    IMG_SP_PORT_ANY
   },
   {
-    EL_SP_PORT2_UP,                            -1, -1,
-    IMG_SP_PORT2_UP
+    EL_SP_GRAVITY_PORT_RIGHT,                  -1, -1,
+    IMG_SP_GRAVITY_PORT_RIGHT
   },
   {
-    EL_SP_PORT_X,                              -1, -1,
-    IMG_SP_PORT_X
+    EL_SP_GRAVITY_PORT_DOWN,                   -1, -1,
+    IMG_SP_GRAVITY_PORT_DOWN
   },
   {
-    EL_SP_PORT_Y,                              -1, -1,
-    IMG_SP_PORT_Y
+    EL_SP_GRAVITY_PORT_LEFT,                   -1, -1,
+    IMG_SP_GRAVITY_PORT_LEFT
   },
   {
-    EL_SP_PORT_XY,                             -1, -1,
-    IMG_SP_PORT_XY
+    EL_SP_GRAVITY_PORT_UP,                     -1, -1,
+    IMG_SP_GRAVITY_PORT_UP
   },
   {
     EL_SP_SNIKSNAK,                            -1, -1,
@@ -437,28 +441,28 @@ element_to_graphic[] =
     IMG_SP_BUGGY_BASE_ACTIVE
   },
   {
-    EL_SP_HARD_BASE1,                          -1, -1,
-    IMG_SP_HARD_BASE1
+    EL_SP_HARDWARE_BASE_1,                     -1, -1,
+    IMG_SP_HARDWARE_BASE_1
   },
   {
-    EL_SP_HARD_BASE2,                          -1, -1,
-    IMG_SP_HARD_BASE2
+    EL_SP_HARDWARE_BASE_2,                     -1, -1,
+    IMG_SP_HARDWARE_BASE_2
   },
   {
-    EL_SP_HARD_BASE3,                          -1, -1,
-    IMG_SP_HARD_BASE3
+    EL_SP_HARDWARE_BASE_3,                     -1, -1,
+    IMG_SP_HARDWARE_BASE_3
   },
   {
-    EL_SP_HARD_BASE4,                          -1, -1,
-    IMG_SP_HARD_BASE4
+    EL_SP_HARDWARE_BASE_4,                     -1, -1,
+    IMG_SP_HARDWARE_BASE_4
   },
   {
-    EL_SP_HARD_BASE5,                          -1, -1,
-    IMG_SP_HARD_BASE5
+    EL_SP_HARDWARE_BASE_5,                     -1, -1,
+    IMG_SP_HARDWARE_BASE_5
   },
   {
-    EL_SP_HARD_BASE6,                          -1, -1,
-    IMG_SP_HARD_BASE6
+    EL_SP_HARDWARE_BASE_6,                     -1, -1,
+    IMG_SP_HARDWARE_BASE_6
   },
   {
     EL_SOKOBAN_OBJECT,                         -1, -1,
@@ -557,12 +561,12 @@ element_to_graphic[] =
     IMG_NUT_MOVING_RIGHT
   },
   {
-    EL_NUT_CRACKING,                           -1, -1,
-    IMG_NUT_CRACKING
+    EL_NUT_BREAKING,                           -1, -1,
+    IMG_NUT_BREAKING
   },
   {
-    EL_NUT,                                    ACTION_CRACKING, -1,
-    IMG_NUT_CRACKING
+    EL_NUT,                                    ACTION_BREAKING, -1,
+    IMG_NUT_BREAKING
   },
   {
     EL_DYNAMITE,                               -1, -1,
@@ -692,6 +696,10 @@ element_to_graphic[] =
     EL_MAGIC_WALL_FILLING,                     -1, -1,
     IMG_MAGIC_WALL_FILLING
   },
+  {
+    EL_MAGIC_WALL,                             ACTION_FILLING, -1,
+    IMG_MAGIC_WALL_FILLING
+  },
   {
     EL_MAGIC_WALL_FULL,                                -1, -1,
     IMG_MAGIC_WALL_FULL
@@ -700,6 +708,10 @@ element_to_graphic[] =
     EL_MAGIC_WALL_EMPTYING,                    -1, -1,
     IMG_MAGIC_WALL_EMPTYING
   },
+  {
+    EL_MAGIC_WALL,                             ACTION_EMPTYING, -1,
+    IMG_MAGIC_WALL_EMPTYING
+  },
   {
     EL_MAGIC_WALL_DEAD,                                -1, -1,
     IMG_MAGIC_WALL_DEAD
@@ -721,24 +733,24 @@ element_to_graphic[] =
     IMG_QUICKSAND_EMPTYING
   },
   {
-    EL_ACIDPOOL_TOPLEFT,                       -1, -1,
-    IMG_ACIDPOOL_TOPLEFT
+    EL_ACID_POOL_TOPLEFT,                      -1, -1,
+    IMG_ACID_POOL_TOPLEFT
   },
   {
-    EL_ACIDPOOL_TOPRIGHT,                      -1, -1,
-    IMG_ACIDPOOL_TOPRIGHT
+    EL_ACID_POOL_TOPRIGHT,                     -1, -1,
+    IMG_ACID_POOL_TOPRIGHT
   },
   {
-    EL_ACIDPOOL_BOTTOMLEFT,                    -1, -1,
-    IMG_ACIDPOOL_BOTTOMLEFT
+    EL_ACID_POOL_BOTTOMLEFT,                   -1, -1,
+    IMG_ACID_POOL_BOTTOMLEFT
   },
   {
-    EL_ACIDPOOL_BOTTOM,                                -1, -1,
-    IMG_ACIDPOOL_BOTTOM
+    EL_ACID_POOL_BOTTOM,                       -1, -1,
+    IMG_ACID_POOL_BOTTOM
   },
   {
-    EL_ACIDPOOL_BOTTOMRIGHT,                   -1, -1,
-    IMG_ACIDPOOL_BOTTOMRIGHT
+    EL_ACID_POOL_BOTTOMRIGHT,                  -1, -1,
+    IMG_ACID_POOL_BOTTOMRIGHT
   },
   {
     EL_ACID,                                   -1, -1,
@@ -757,8 +769,8 @@ element_to_graphic[] =
     IMG_AMOEBA_DROP
   },
   {
-    EL_AMOEBA_CREATING,                                -1, -1,
-    IMG_AMOEBA_CREATING
+    EL_AMOEBA_GROWING,                         -1, -1,
+    IMG_AMOEBA_GROWING
   },
   {
     EL_AMOEBA_SHRINKING,                       -1, -1,
@@ -769,8 +781,8 @@ element_to_graphic[] =
     IMG_AMOEBA_WET
   },
   {
-    EL_AMOEBA_DRIPPING,                                -1, -1,
-    IMG_AMOEBA_DRIPPING
+    EL_AMOEBA_DROPPING,                                -1, -1,
+    IMG_AMOEBA_DROPPING
   },
   {
     EL_AMOEBA_DRY,                             -1, -1,
@@ -785,52 +797,52 @@ element_to_graphic[] =
     IMG_AMOEBA_DEAD
   },
   {
-    EL_EM_KEY1,                                        -1, -1,
-    IMG_EM_KEY1
+    EL_EM_KEY_1,                               -1, -1,
+    IMG_EM_KEY_1
   },
   {
-    EL_EM_KEY2,                                        -1, -1,
-    IMG_EM_KEY2
+    EL_EM_KEY_2,                               -1, -1,
+    IMG_EM_KEY_2
   },
   {
-    EL_EM_KEY3,                                        -1, -1,
-    IMG_EM_KEY3
+    EL_EM_KEY_3,                               -1, -1,
+    IMG_EM_KEY_3
   },
   {
-    EL_EM_KEY4,                                        -1, -1,
-    IMG_EM_KEY4
+    EL_EM_KEY_4,                               -1, -1,
+    IMG_EM_KEY_4
   },
   {
-    EL_EM_GATE1,                               -1, -1,
-    IMG_EM_GATE1
+    EL_EM_GATE_1,                              -1, -1,
+    IMG_EM_GATE_1
   },
   {
-    EL_EM_GATE2,                               -1, -1,
-    IMG_EM_GATE2
+    EL_EM_GATE_2,                              -1, -1,
+    IMG_EM_GATE_2
   },
   {
-    EL_EM_GATE3,                               -1, -1,
-    IMG_EM_GATE3
+    EL_EM_GATE_3,                              -1, -1,
+    IMG_EM_GATE_3
   },
   {
-    EL_EM_GATE4,                               -1, -1,
-    IMG_EM_GATE4
+    EL_EM_GATE_4,                              -1, -1,
+    IMG_EM_GATE_4
   },
   {
-    EL_EM_GATE1_GRAY,                          -1, -1,
-    IMG_EM_GATE1_GRAY
+    EL_EM_GATE_1_GRAY,                         -1, -1,
+    IMG_EM_GATE_1_GRAY
   },
   {
-    EL_EM_GATE2_GRAY,                          -1, -1,
-    IMG_EM_GATE2_GRAY
+    EL_EM_GATE_2_GRAY,                         -1, -1,
+    IMG_EM_GATE_2_GRAY
   },
   {
-    EL_EM_GATE3_GRAY,                          -1, -1,
-    IMG_EM_GATE3_GRAY
+    EL_EM_GATE_3_GRAY,                         -1, -1,
+    IMG_EM_GATE_3_GRAY
   },
   {
-    EL_EM_GATE4_GRAY,                          -1, -1,
-    IMG_EM_GATE4_GRAY
+    EL_EM_GATE_4_GRAY,                         -1, -1,
+    IMG_EM_GATE_4_GRAY
   },
   {
     EL_EXIT_CLOSED,                            -1, -1,
@@ -853,24 +865,24 @@ element_to_graphic[] =
     IMG_BALLOON_MOVING
   },
   {
-    EL_BALLOON_SEND_LEFT,                      -1, -1,
-    IMG_BALLOON_SEND_LEFT
+    EL_BALLOON_SWITCH_LEFT,                    -1, -1,
+    IMG_BALLOON_SWITCH_LEFT
   },
   {
-    EL_BALLOON_SEND_RIGHT,                     -1, -1,
-    IMG_BALLOON_SEND_RIGHT
+    EL_BALLOON_SWITCH_RIGHT,                   -1, -1,
+    IMG_BALLOON_SWITCH_RIGHT
   },
   {
-    EL_BALLOON_SEND_UP,                                -1, -1,
-    IMG_BALLOON_SEND_UP
+    EL_BALLOON_SWITCH_UP,                      -1, -1,
+    IMG_BALLOON_SWITCH_UP
   },
   {
-    EL_BALLOON_SEND_DOWN,                      -1, -1,
-    IMG_BALLOON_SEND_DOWN
+    EL_BALLOON_SWITCH_DOWN,                    -1, -1,
+    IMG_BALLOON_SWITCH_DOWN
   },
   {
-    EL_BALLOON_SEND_ANY_DIRECTION,             -1, -1,
-    IMG_BALLOON_SEND_ANY_DIRECTION
+    EL_BALLOON_SWITCH_ANY,                     -1, -1,
+    IMG_BALLOON_SWITCH_ANY
   },
   {
     EL_SPRING,                                 -1, -1,
@@ -881,52 +893,52 @@ element_to_graphic[] =
     IMG_SPRING_MOVING
   },
   {
-    EL_EMC_STEELWALL1,                         -1, -1,
-    IMG_EMC_STEELWALL1
+    EL_EMC_STEELWALL_1,                                -1, -1,
+    IMG_EMC_STEELWALL_1
   },
   {
-    EL_EMC_STEELWALL2,                         -1, -1,
-    IMG_EMC_STEELWALL2
+    EL_EMC_STEELWALL_2,                                -1, -1,
+    IMG_EMC_STEELWALL_2
   },
   {
-    EL_EMC_STEELWALL3,                         -1, -1,
-    IMG_EMC_STEELWALL3
+    EL_EMC_STEELWALL_3,                                -1, -1,
+    IMG_EMC_STEELWALL_3
   },
   {
-    EL_EMC_STEELWALL4,                         -1, -1,
-    IMG_EMC_STEELWALL4
+    EL_EMC_STEELWALL_4,                                -1, -1,
+    IMG_EMC_STEELWALL_4
   },
   {
-    EL_EMC_WALL_PILLAR_UPPER,                  -1, -1,
-    IMG_EMC_WALL_PILLAR_UPPER
+    EL_EMC_WALL_1,                             -1, -1,
+    IMG_EMC_WALL_1
   },
   {
-    EL_EMC_WALL_PILLAR_MIDDLE,                 -1, -1,
-    IMG_EMC_WALL_PILLAR_MIDDLE
+    EL_EMC_WALL_2,                             -1, -1,
+    IMG_EMC_WALL_2
   },
   {
-    EL_EMC_WALL_PILLAR_LOWER,                  -1, -1,
-    IMG_EMC_WALL_PILLAR_LOWER
+    EL_EMC_WALL_3,                             -1, -1,
+    IMG_EMC_WALL_3
   },
   {
-    EL_EMC_WALL4,                              -1, -1,
-    IMG_EMC_WALL4
+    EL_EMC_WALL_4,                             -1, -1,
+    IMG_EMC_WALL_4
   },
   {
-    EL_EMC_WALL5,                              -1, -1,
-    IMG_EMC_WALL5
+    EL_EMC_WALL_5,                             -1, -1,
+    IMG_EMC_WALL_5
   },
   {
-    EL_EMC_WALL6,                              -1, -1,
-    IMG_EMC_WALL6
+    EL_EMC_WALL_6,                             -1, -1,
+    IMG_EMC_WALL_6
   },
   {
-    EL_EMC_WALL7,                              -1, -1,
-    IMG_EMC_WALL7
+    EL_EMC_WALL_7,                             -1, -1,
+    IMG_EMC_WALL_7
   },
   {
-    EL_EMC_WALL8,                              -1, -1,
-    IMG_EMC_WALL8
+    EL_EMC_WALL_8,                             -1, -1,
+    IMG_EMC_WALL_8
   },
   {
     EL_INVISIBLE_STEELWALL,                    -1, -1,
@@ -965,196 +977,196 @@ element_to_graphic[] =
     IMG_INVISIBLE_SAND_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT1_MIDDLE,                  -1, -1,
-    IMG_CONVEYOR_BELT1_MIDDLE
+    EL_CONVEYOR_BELT_1_MIDDLE,                 -1, -1,
+    IMG_CONVEYOR_BELT_1_MIDDLE
   },
   {
-    EL_CONVEYOR_BELT1_MIDDLE_ACTIVE,           -1, -1,
-    IMG_CONVEYOR_BELT1_MIDDLE_ACTIVE
+    EL_CONVEYOR_BELT_1_MIDDLE_ACTIVE,          -1, -1,
+    IMG_CONVEYOR_BELT_1_MIDDLE_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT1_MIDDLE,                  ACTION_ACTIVE, -1,
-    IMG_CONVEYOR_BELT1_MIDDLE_ACTIVE
+    EL_CONVEYOR_BELT_1_MIDDLE,                 ACTION_ACTIVE, -1,
+    IMG_CONVEYOR_BELT_1_MIDDLE_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT1_LEFT,                    -1, -1,
-    IMG_CONVEYOR_BELT1_LEFT
+    EL_CONVEYOR_BELT_1_LEFT,                   -1, -1,
+    IMG_CONVEYOR_BELT_1_LEFT
   },
   {
-    EL_CONVEYOR_BELT1_LEFT_ACTIVE,             -1, -1,
-    IMG_CONVEYOR_BELT1_LEFT_ACTIVE
+    EL_CONVEYOR_BELT_1_LEFT_ACTIVE,            -1, -1,
+    IMG_CONVEYOR_BELT_1_LEFT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT1_LEFT,                    ACTION_ACTIVE, -1,
-    IMG_CONVEYOR_BELT1_LEFT_ACTIVE
+    EL_CONVEYOR_BELT_1_LEFT,                   ACTION_ACTIVE, -1,
+    IMG_CONVEYOR_BELT_1_LEFT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT1_RIGHT,                   -1, -1,
-    IMG_CONVEYOR_BELT1_RIGHT
+    EL_CONVEYOR_BELT_1_RIGHT,                  -1, -1,
+    IMG_CONVEYOR_BELT_1_RIGHT
   },
   {
-    EL_CONVEYOR_BELT1_RIGHT_ACTIVE,            -1, -1,
-    IMG_CONVEYOR_BELT1_RIGHT_ACTIVE
+    EL_CONVEYOR_BELT_1_RIGHT_ACTIVE,           -1, -1,
+    IMG_CONVEYOR_BELT_1_RIGHT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT1_RIGHT,                   ACTION_ACTIVE, -1,
-    IMG_CONVEYOR_BELT1_RIGHT_ACTIVE
+    EL_CONVEYOR_BELT_1_RIGHT,                  ACTION_ACTIVE, -1,
+    IMG_CONVEYOR_BELT_1_RIGHT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT1_SWITCH_LEFT,             -1, -1,
-    IMG_CONVEYOR_BELT1_SWITCH_LEFT
+    EL_CONVEYOR_BELT_1_SWITCH_LEFT,            -1, -1,
+    IMG_CONVEYOR_BELT_1_SWITCH_LEFT
   },
   {
-    EL_CONVEYOR_BELT1_SWITCH_MIDDLE,           -1, -1,
-    IMG_CONVEYOR_BELT1_SWITCH_MIDDLE
+    EL_CONVEYOR_BELT_1_SWITCH_MIDDLE,          -1, -1,
+    IMG_CONVEYOR_BELT_1_SWITCH_MIDDLE
   },
   {
-    EL_CONVEYOR_BELT1_SWITCH_RIGHT,            -1, -1,
-    IMG_CONVEYOR_BELT1_SWITCH_RIGHT
+    EL_CONVEYOR_BELT_1_SWITCH_RIGHT,           -1, -1,
+    IMG_CONVEYOR_BELT_1_SWITCH_RIGHT
   },
   {
-    EL_CONVEYOR_BELT2_MIDDLE,                  -1, -1,
-    IMG_CONVEYOR_BELT2_MIDDLE
+    EL_CONVEYOR_BELT_2_MIDDLE,                 -1, -1,
+    IMG_CONVEYOR_BELT_2_MIDDLE
   },
   {
-    EL_CONVEYOR_BELT2_MIDDLE_ACTIVE,           -1, -1,
-    IMG_CONVEYOR_BELT2_MIDDLE_ACTIVE
+    EL_CONVEYOR_BELT_2_MIDDLE_ACTIVE,          -1, -1,
+    IMG_CONVEYOR_BELT_2_MIDDLE_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT2_MIDDLE,                  ACTION_ACTIVE, -1,
-    IMG_CONVEYOR_BELT2_MIDDLE_ACTIVE
+    EL_CONVEYOR_BELT_2_MIDDLE,                 ACTION_ACTIVE, -1,
+    IMG_CONVEYOR_BELT_2_MIDDLE_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT2_LEFT,                    -1, -1,
-    IMG_CONVEYOR_BELT2_LEFT
+    EL_CONVEYOR_BELT_2_LEFT,                   -1, -1,
+    IMG_CONVEYOR_BELT_2_LEFT
   },
   {
-    EL_CONVEYOR_BELT2_LEFT_ACTIVE,             -1, -1,
-    IMG_CONVEYOR_BELT2_LEFT_ACTIVE
+    EL_CONVEYOR_BELT_2_LEFT_ACTIVE,            -1, -1,
+    IMG_CONVEYOR_BELT_2_LEFT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT2_LEFT,                    ACTION_ACTIVE, -1,
-    IMG_CONVEYOR_BELT2_LEFT_ACTIVE
+    EL_CONVEYOR_BELT_2_LEFT,                   ACTION_ACTIVE, -1,
+    IMG_CONVEYOR_BELT_2_LEFT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT2_RIGHT,                   -1, -1,
-    IMG_CONVEYOR_BELT2_RIGHT
+    EL_CONVEYOR_BELT_2_RIGHT,                  -1, -1,
+    IMG_CONVEYOR_BELT_2_RIGHT
   },
   {
-    EL_CONVEYOR_BELT2_RIGHT_ACTIVE,            -1, -1,
-    IMG_CONVEYOR_BELT2_RIGHT_ACTIVE
+    EL_CONVEYOR_BELT_2_RIGHT_ACTIVE,           -1, -1,
+    IMG_CONVEYOR_BELT_2_RIGHT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT2_RIGHT,                   ACTION_ACTIVE, -1,
-    IMG_CONVEYOR_BELT2_RIGHT_ACTIVE
+    EL_CONVEYOR_BELT_2_RIGHT,                  ACTION_ACTIVE, -1,
+    IMG_CONVEYOR_BELT_2_RIGHT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT2_SWITCH_LEFT,             -1, -1,
-    IMG_CONVEYOR_BELT2_SWITCH_LEFT
+    EL_CONVEYOR_BELT_2_SWITCH_LEFT,            -1, -1,
+    IMG_CONVEYOR_BELT_2_SWITCH_LEFT
   },
   {
-    EL_CONVEYOR_BELT2_SWITCH_MIDDLE,           -1, -1,
-    IMG_CONVEYOR_BELT2_SWITCH_MIDDLE
+    EL_CONVEYOR_BELT_2_SWITCH_MIDDLE,          -1, -1,
+    IMG_CONVEYOR_BELT_2_SWITCH_MIDDLE
   },
   {
-    EL_CONVEYOR_BELT2_SWITCH_RIGHT,            -1, -1,
-    IMG_CONVEYOR_BELT2_SWITCH_RIGHT
+    EL_CONVEYOR_BELT_2_SWITCH_RIGHT,           -1, -1,
+    IMG_CONVEYOR_BELT_2_SWITCH_RIGHT
   },
   {
-    EL_CONVEYOR_BELT3_MIDDLE,                  -1, -1,
-    IMG_CONVEYOR_BELT3_MIDDLE
+    EL_CONVEYOR_BELT_3_MIDDLE,                 -1, -1,
+    IMG_CONVEYOR_BELT_3_MIDDLE
   },
   {
-    EL_CONVEYOR_BELT3_MIDDLE_ACTIVE,           -1, -1,
-    IMG_CONVEYOR_BELT3_MIDDLE_ACTIVE
+    EL_CONVEYOR_BELT_3_MIDDLE_ACTIVE,          -1, -1,
+    IMG_CONVEYOR_BELT_3_MIDDLE_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT3_MIDDLE,                  ACTION_ACTIVE, -1,
-    IMG_CONVEYOR_BELT3_MIDDLE_ACTIVE
+    EL_CONVEYOR_BELT_3_MIDDLE,                 ACTION_ACTIVE, -1,
+    IMG_CONVEYOR_BELT_3_MIDDLE_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT3_LEFT,                    -1, -1,
-    IMG_CONVEYOR_BELT3_LEFT
+    EL_CONVEYOR_BELT_3_LEFT,                   -1, -1,
+    IMG_CONVEYOR_BELT_3_LEFT
   },
   {
-    EL_CONVEYOR_BELT3_LEFT_ACTIVE,             -1, -1,
-    IMG_CONVEYOR_BELT3_LEFT_ACTIVE
+    EL_CONVEYOR_BELT_3_LEFT_ACTIVE,            -1, -1,
+    IMG_CONVEYOR_BELT_3_LEFT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT3_LEFT,                    ACTION_ACTIVE, -1,
-    IMG_CONVEYOR_BELT3_LEFT_ACTIVE
+    EL_CONVEYOR_BELT_3_LEFT,                   ACTION_ACTIVE, -1,
+    IMG_CONVEYOR_BELT_3_LEFT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT3_RIGHT,                   -1, -1,
-    IMG_CONVEYOR_BELT3_RIGHT
+    EL_CONVEYOR_BELT_3_RIGHT,                  -1, -1,
+    IMG_CONVEYOR_BELT_3_RIGHT
   },
   {
-    EL_CONVEYOR_BELT3_RIGHT_ACTIVE,            -1, -1,
-    IMG_CONVEYOR_BELT3_RIGHT_ACTIVE
+    EL_CONVEYOR_BELT_3_RIGHT_ACTIVE,           -1, -1,
+    IMG_CONVEYOR_BELT_3_RIGHT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT3_RIGHT,                   ACTION_ACTIVE, -1,
-    IMG_CONVEYOR_BELT3_RIGHT_ACTIVE
+    EL_CONVEYOR_BELT_3_RIGHT,                  ACTION_ACTIVE, -1,
+    IMG_CONVEYOR_BELT_3_RIGHT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT3_SWITCH_LEFT,             -1, -1,
-    IMG_CONVEYOR_BELT3_SWITCH_LEFT
+    EL_CONVEYOR_BELT_3_SWITCH_LEFT,            -1, -1,
+    IMG_CONVEYOR_BELT_3_SWITCH_LEFT
   },
   {
-    EL_CONVEYOR_BELT3_SWITCH_MIDDLE,           -1, -1,
-    IMG_CONVEYOR_BELT3_SWITCH_MIDDLE
+    EL_CONVEYOR_BELT_3_SWITCH_MIDDLE,          -1, -1,
+    IMG_CONVEYOR_BELT_3_SWITCH_MIDDLE
   },
   {
-    EL_CONVEYOR_BELT3_SWITCH_RIGHT,            -1, -1,
-    IMG_CONVEYOR_BELT3_SWITCH_RIGHT
+    EL_CONVEYOR_BELT_3_SWITCH_RIGHT,           -1, -1,
+    IMG_CONVEYOR_BELT_3_SWITCH_RIGHT
   },
   {
-    EL_CONVEYOR_BELT4_MIDDLE,                  -1, -1,
-    IMG_CONVEYOR_BELT4_MIDDLE
+    EL_CONVEYOR_BELT_4_MIDDLE,                 -1, -1,
+    IMG_CONVEYOR_BELT_4_MIDDLE
   },
   {
-    EL_CONVEYOR_BELT4_MIDDLE_ACTIVE,           -1, -1,
-    IMG_CONVEYOR_BELT4_MIDDLE_ACTIVE
+    EL_CONVEYOR_BELT_4_MIDDLE_ACTIVE,          -1, -1,
+    IMG_CONVEYOR_BELT_4_MIDDLE_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT4_MIDDLE,                  ACTION_ACTIVE, -1,
-    IMG_CONVEYOR_BELT4_MIDDLE_ACTIVE
+    EL_CONVEYOR_BELT_4_MIDDLE,                 ACTION_ACTIVE, -1,
+    IMG_CONVEYOR_BELT_4_MIDDLE_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT4_LEFT,                    -1, -1,
-    IMG_CONVEYOR_BELT4_LEFT
+    EL_CONVEYOR_BELT_4_LEFT,                   -1, -1,
+    IMG_CONVEYOR_BELT_4_LEFT
   },
   {
-    EL_CONVEYOR_BELT4_LEFT_ACTIVE,             -1, -1,
-    IMG_CONVEYOR_BELT4_LEFT_ACTIVE
+    EL_CONVEYOR_BELT_4_LEFT_ACTIVE,            -1, -1,
+    IMG_CONVEYOR_BELT_4_LEFT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT4_LEFT,                    ACTION_ACTIVE, -1,
-    IMG_CONVEYOR_BELT4_LEFT_ACTIVE
+    EL_CONVEYOR_BELT_4_LEFT,                   ACTION_ACTIVE, -1,
+    IMG_CONVEYOR_BELT_4_LEFT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT4_RIGHT,                   -1, -1,
-    IMG_CONVEYOR_BELT4_RIGHT
+    EL_CONVEYOR_BELT_4_RIGHT,                  -1, -1,
+    IMG_CONVEYOR_BELT_4_RIGHT
   },
   {
-    EL_CONVEYOR_BELT4_RIGHT_ACTIVE,            -1, -1,
-    IMG_CONVEYOR_BELT4_RIGHT_ACTIVE
+    EL_CONVEYOR_BELT_4_RIGHT_ACTIVE,           -1, -1,
+    IMG_CONVEYOR_BELT_4_RIGHT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT4_RIGHT,                   ACTION_ACTIVE, -1,
-    IMG_CONVEYOR_BELT4_RIGHT_ACTIVE
+    EL_CONVEYOR_BELT_4_RIGHT,                  ACTION_ACTIVE, -1,
+    IMG_CONVEYOR_BELT_4_RIGHT_ACTIVE
   },
   {
-    EL_CONVEYOR_BELT4_SWITCH_LEFT,             -1, -1,
-    IMG_CONVEYOR_BELT4_SWITCH_LEFT
+    EL_CONVEYOR_BELT_4_SWITCH_LEFT,            -1, -1,
+    IMG_CONVEYOR_BELT_4_SWITCH_LEFT
   },
   {
-    EL_CONVEYOR_BELT4_SWITCH_MIDDLE,           -1, -1,
-    IMG_CONVEYOR_BELT4_SWITCH_MIDDLE
+    EL_CONVEYOR_BELT_4_SWITCH_MIDDLE,          -1, -1,
+    IMG_CONVEYOR_BELT_4_SWITCH_MIDDLE
   },
   {
-    EL_CONVEYOR_BELT4_SWITCH_RIGHT,            -1, -1,
-    IMG_CONVEYOR_BELT4_SWITCH_RIGHT
+    EL_CONVEYOR_BELT_4_SWITCH_RIGHT,           -1, -1,
+    IMG_CONVEYOR_BELT_4_SWITCH_RIGHT
   },
   {
     EL_SWITCHGATE_SWITCH_UP,                   -1, -1,
@@ -1313,8 +1325,8 @@ element_to_graphic[] =
     IMG_TUBE_VERTICAL_RIGHT
   },
   {
-    EL_TUBE_ALL,                               -1, -1,
-    IMG_TUBE_ALL
+    EL_TUBE_ANY,                               -1, -1,
+    IMG_TUBE_ANY
   },
   {
     EL_TUBE_VERTICAL_LEFT,                     -1, -1,
@@ -1353,56 +1365,56 @@ element_to_graphic[] =
     IMG_DX_SUPABOMB
   },
   {
-    EL_KEY1,                                   -1, -1,
-    IMG_KEY1
+    EL_KEY_1,                                  -1, -1,
+    IMG_KEY_1
   },
   {
-    EL_KEY2,                                   -1, -1,
-    IMG_KEY2
+    EL_KEY_2,                                  -1, -1,
+    IMG_KEY_2
   },
   {
-    EL_KEY3,                                   -1, -1,
-    IMG_KEY3
+    EL_KEY_3,                                  -1, -1,
+    IMG_KEY_3
   },
   {
-    EL_KEY4,                                   -1, -1,
-    IMG_KEY4
+    EL_KEY_4,                                  -1, -1,
+    IMG_KEY_4
   },
   {
-    EL_GATE1,                                  -1, -1,
-    IMG_GATE1
+    EL_GATE_1,                                 -1, -1,
+    IMG_GATE_1
   },
   {
-    EL_GATE2,                                  -1, -1,
-    IMG_GATE2
+    EL_GATE_2,                                 -1, -1,
+    IMG_GATE_2
   },
   {
-    EL_GATE3,                                  -1, -1,
-    IMG_GATE3
+    EL_GATE_3,                                 -1, -1,
+    IMG_GATE_3
   },
   {
-    EL_GATE4,                                  -1, -1,
-    IMG_GATE4
+    EL_GATE_4,                                 -1, -1,
+    IMG_GATE_4
   },
   {
-    EL_GATE1_GRAY,                             -1, -1,
-    IMG_GATE1_GRAY
+    EL_GATE_1_GRAY,                            -1, -1,
+    IMG_GATE_1_GRAY
   },
   {
-    EL_GATE2_GRAY,                             -1, -1,
-    IMG_GATE2_GRAY
+    EL_GATE_2_GRAY,                            -1, -1,
+    IMG_GATE_2_GRAY
   },
   {
-    EL_GATE3_GRAY,                             -1, -1,
-    IMG_GATE3_GRAY
+    EL_GATE_3_GRAY,                            -1, -1,
+    IMG_GATE_3_GRAY
   },
   {
-    EL_GATE4_GRAY,                             -1, -1,
-    IMG_GATE4_GRAY
+    EL_GATE_4_GRAY,                            -1, -1,
+    IMG_GATE_4_GRAY
   },
   {
-    EL_GAMEOFLIFE,                             -1, -1,
-    IMG_GAMEOFLIFE
+    EL_GAME_OF_LIFE,                           -1, -1,
+    IMG_GAME_OF_LIFE
   },
   {
     EL_BIOMAZE,                                        -1, -1,
@@ -1513,52 +1525,52 @@ element_to_graphic[] =
     IMG_WALL_BD_DIAMOND
   },
   {
-    EL_WALL_GROWING,                           -1, -1,
-    IMG_WALL_GROWING
+    EL_EXPANDABLE_WALL,                                -1, -1,
+    IMG_EXPANDABLE_WALL
   },
   {
-    EL_WALL_GROWING_XY,                                -1, -1,
-    IMG_WALL_GROWING_XY
+    EL_EXPANDABLE_WALL_HORIZONTAL,             -1, -1,
+    IMG_EXPANDABLE_WALL_HORIZONTAL
   },
   {
-    EL_WALL_GROWING_X,                         -1, -1,
-    IMG_WALL_GROWING_X
+    EL_EXPANDABLE_WALL_VERTICAL,               -1, -1,
+    IMG_EXPANDABLE_WALL_VERTICAL
   },
   {
-    EL_WALL_GROWING_Y,                         -1, -1,
-    IMG_WALL_GROWING_Y
+    EL_EXPANDABLE_WALL_ANY,                    -1, -1,
+    IMG_EXPANDABLE_WALL_ANY
   },
   {
-    EL_WALL_GROWING,                           ACTION_ACTIVE, MV_BIT_LEFT,
-    IMG_WALL_GROWING_ACTIVE_LEFT
+    EL_EXPANDABLE_WALL,                                ACTION_GROWING, MV_BIT_LEFT,
+    IMG_EXPANDABLE_WALL_GROWING_LEFT
   },
   {
-    EL_WALL_GROWING_ACTIVE,                    -1, MV_BIT_LEFT,
-    IMG_WALL_GROWING_ACTIVE_LEFT
+    EL_EXPANDABLE_WALL_GROWING,                        -1, MV_BIT_LEFT,
+    IMG_EXPANDABLE_WALL_GROWING_LEFT
   },
   {
-    EL_WALL_GROWING,                           ACTION_ACTIVE, MV_BIT_RIGHT,
-    IMG_WALL_GROWING_ACTIVE_RIGHT
+    EL_EXPANDABLE_WALL,                                ACTION_GROWING, MV_BIT_RIGHT,
+    IMG_EXPANDABLE_WALL_GROWING_RIGHT
   },
   {
-    EL_WALL_GROWING_ACTIVE,                    -1, MV_BIT_RIGHT,
-    IMG_WALL_GROWING_ACTIVE_RIGHT
+    EL_EXPANDABLE_WALL_GROWING,                        -1, MV_BIT_RIGHT,
+    IMG_EXPANDABLE_WALL_GROWING_RIGHT
   },
   {
-    EL_WALL_GROWING,                           ACTION_ACTIVE, MV_BIT_UP,
-    IMG_WALL_GROWING_ACTIVE_UP
+    EL_EXPANDABLE_WALL,                                ACTION_GROWING, MV_BIT_UP,
+    IMG_EXPANDABLE_WALL_GROWING_UP
   },
   {
-    EL_WALL_GROWING_ACTIVE,                    -1, MV_BIT_UP,
-    IMG_WALL_GROWING_ACTIVE_UP
+    EL_EXPANDABLE_WALL_GROWING,                        -1, MV_BIT_UP,
+    IMG_EXPANDABLE_WALL_GROWING_UP
   },
   {
-    EL_WALL_GROWING,                           ACTION_ACTIVE, MV_BIT_DOWN,
-    IMG_WALL_GROWING_ACTIVE_DOWN
+    EL_EXPANDABLE_WALL,                                ACTION_GROWING, MV_BIT_DOWN,
+    IMG_EXPANDABLE_WALL_GROWING_DOWN
   },
   {
-    EL_WALL_GROWING_ACTIVE,                    -1, MV_BIT_DOWN,
-    IMG_WALL_GROWING_ACTIVE_DOWN
+    EL_EXPANDABLE_WALL_GROWING,                        -1, MV_BIT_DOWN,
+    IMG_EXPANDABLE_WALL_GROWING_DOWN
   },
   {
     EL_BLACK_ORB,                              -1, -1,
@@ -1577,32 +1589,32 @@ element_to_graphic[] =
     IMG_DYNABOMB_ACTIVE
   },
   {
-    EL_DYNABOMB_PLAYER1_ACTIVE,                        -1, -1,
-    IMG_DYNABOMB_PLAYER1_ACTIVE
+    EL_DYNABOMB_PLAYER_1_ACTIVE,               -1, -1,
+    IMG_DYNABOMB_PLAYER_1_ACTIVE
   },
   {
-    EL_DYNABOMB_PLAYER2_ACTIVE,                        -1, -1,
-    IMG_DYNABOMB_PLAYER2_ACTIVE
+    EL_DYNABOMB_PLAYER_2_ACTIVE,               -1, -1,
+    IMG_DYNABOMB_PLAYER_2_ACTIVE
   },
   {
-    EL_DYNABOMB_PLAYER3_ACTIVE,                        -1, -1,
-    IMG_DYNABOMB_PLAYER3_ACTIVE
+    EL_DYNABOMB_PLAYER_3_ACTIVE,               -1, -1,
+    IMG_DYNABOMB_PLAYER_3_ACTIVE
   },
   {
-    EL_DYNABOMB_PLAYER4_ACTIVE,                        -1, -1,
-    IMG_DYNABOMB_PLAYER4_ACTIVE
+    EL_DYNABOMB_PLAYER_4_ACTIVE,               -1, -1,
+    IMG_DYNABOMB_PLAYER_4_ACTIVE
   },
   {
-    EL_DYNABOMB_NR,                            -1, -1,
-    IMG_DYNABOMB_NR
+    EL_DYNABOMB_INCREASE_NUMBER,               -1, -1,
+    IMG_DYNABOMB_INCREASE_NUMBER
   },
   {
-    EL_DYNABOMB_SZ,                            -1, -1,
-    IMG_DYNABOMB_SZ
+    EL_DYNABOMB_INCREASE_SIZE,                 -1, -1,
+    IMG_DYNABOMB_INCREASE_SIZE
   },
   {
-    EL_DYNABOMB_XL,                            -1, -1,
-    IMG_DYNABOMB_XL
+    EL_DYNABOMB_INCREASE_POWER,                        -1, -1,
+    IMG_DYNABOMB_INCREASE_POWER
   },
   {
     EL_PIG,                                    -1, -1,
@@ -1641,20 +1653,20 @@ element_to_graphic[] =
     IMG_PIG_MOVING_RIGHT
   },
   {
-    EL_PIG,                                    ACTION_EATING, MV_BIT_DOWN,
-    IMG_PIG_EATING_DOWN
+    EL_PIG,                                    ACTION_DIGGING, MV_BIT_DOWN,
+    IMG_PIG_DIGGING_DOWN
   },
   {
-    EL_PIG,                                    ACTION_EATING, MV_BIT_UP,
-    IMG_PIG_EATING_UP
+    EL_PIG,                                    ACTION_DIGGING, MV_BIT_UP,
+    IMG_PIG_DIGGING_UP
   },
   {
-    EL_PIG,                                    ACTION_EATING, MV_BIT_LEFT,
-    IMG_PIG_EATING_LEFT
+    EL_PIG,                                    ACTION_DIGGING, MV_BIT_LEFT,
+    IMG_PIG_DIGGING_LEFT
   },
   {
-    EL_PIG,                                    ACTION_EATING, MV_BIT_RIGHT,
-    IMG_PIG_EATING_RIGHT
+    EL_PIG,                                    ACTION_DIGGING, MV_BIT_RIGHT,
+    IMG_PIG_DIGGING_RIGHT
   },
   {
     EL_DRAGON,                                 -1, -1,
@@ -1825,340 +1837,340 @@ element_to_graphic[] =
     IMG_STONEBLOCK
   },
   {
-    EL_PLAYER1,                                        -1, -1,
-    IMG_PLAYER1
+    EL_PLAYER_1,                               -1, -1,
+    IMG_PLAYER_1
   },
   {
-    EL_PLAYER1,                                        -1, MV_BIT_DOWN,
-    IMG_PLAYER1_DOWN
+    EL_PLAYER_1,                               -1, MV_BIT_DOWN,
+    IMG_PLAYER_1_DOWN
   },
   {
-    EL_PLAYER1,                                        -1, MV_BIT_UP,
-    IMG_PLAYER1_UP
+    EL_PLAYER_1,                               -1, MV_BIT_UP,
+    IMG_PLAYER_1_UP
   },
   {
-    EL_PLAYER1,                                        -1, MV_BIT_LEFT,
-    IMG_PLAYER1_LEFT
+    EL_PLAYER_1,                               -1, MV_BIT_LEFT,
+    IMG_PLAYER_1_LEFT
   },
   {
-    EL_PLAYER1,                                        -1, MV_BIT_RIGHT,
-    IMG_PLAYER1_RIGHT
+    EL_PLAYER_1,                               -1, MV_BIT_RIGHT,
+    IMG_PLAYER_1_RIGHT
   },
   {
-    EL_PLAYER1,                                        ACTION_MOVING, MV_BIT_DOWN,
-    IMG_PLAYER1_MOVING_DOWN
+    EL_PLAYER_1,                               ACTION_MOVING, MV_BIT_DOWN,
+    IMG_PLAYER_1_MOVING_DOWN
   },
   {
-    EL_PLAYER1,                                        ACTION_MOVING, MV_BIT_UP,
-    IMG_PLAYER1_MOVING_UP
+    EL_PLAYER_1,                               ACTION_MOVING, MV_BIT_UP,
+    IMG_PLAYER_1_MOVING_UP
   },
   {
-    EL_PLAYER1,                                        ACTION_MOVING, MV_BIT_LEFT,
-    IMG_PLAYER1_MOVING_LEFT
+    EL_PLAYER_1,                               ACTION_MOVING, MV_BIT_LEFT,
+    IMG_PLAYER_1_MOVING_LEFT
   },
   {
-    EL_PLAYER1,                                        ACTION_MOVING, MV_BIT_RIGHT,
-    IMG_PLAYER1_MOVING_RIGHT
+    EL_PLAYER_1,                               ACTION_MOVING, MV_BIT_RIGHT,
+    IMG_PLAYER_1_MOVING_RIGHT
   },
   {
-    EL_PLAYER1,                                        ACTION_DIGGING, MV_BIT_DOWN,
-    IMG_PLAYER1_DIGGING_DOWN
+    EL_PLAYER_1,                               ACTION_DIGGING, MV_BIT_DOWN,
+    IMG_PLAYER_1_DIGGING_DOWN
   },
   {
-    EL_PLAYER1,                                        ACTION_DIGGING, MV_BIT_UP,
-    IMG_PLAYER1_DIGGING_UP
+    EL_PLAYER_1,                               ACTION_DIGGING, MV_BIT_UP,
+    IMG_PLAYER_1_DIGGING_UP
   },
   {
-    EL_PLAYER1,                                        ACTION_DIGGING, MV_BIT_LEFT,
-    IMG_PLAYER1_DIGGING_LEFT
+    EL_PLAYER_1,                               ACTION_DIGGING, MV_BIT_LEFT,
+    IMG_PLAYER_1_DIGGING_LEFT
   },
   {
-    EL_PLAYER1,                                        ACTION_DIGGING, MV_BIT_RIGHT,
-    IMG_PLAYER1_DIGGING_RIGHT
+    EL_PLAYER_1,                               ACTION_DIGGING, MV_BIT_RIGHT,
+    IMG_PLAYER_1_DIGGING_RIGHT
   },
   {
-    EL_PLAYER1,                                        ACTION_PUSHING, MV_BIT_DOWN,
-    IMG_PLAYER1_PUSHING_DOWN
+    EL_PLAYER_1,                               ACTION_PUSHING, MV_BIT_DOWN,
+    IMG_PLAYER_1_PUSHING_DOWN
   },
   {
-    EL_PLAYER1,                                        ACTION_PUSHING, MV_BIT_UP,
-    IMG_PLAYER1_PUSHING_UP
+    EL_PLAYER_1,                               ACTION_PUSHING, MV_BIT_UP,
+    IMG_PLAYER_1_PUSHING_UP
   },
   {
-    EL_PLAYER1,                                        ACTION_PUSHING, MV_BIT_LEFT,
-    IMG_PLAYER1_PUSHING_LEFT
+    EL_PLAYER_1,                               ACTION_PUSHING, MV_BIT_LEFT,
+    IMG_PLAYER_1_PUSHING_LEFT
   },
   {
-    EL_PLAYER1,                                        ACTION_PUSHING, MV_BIT_RIGHT,
-    IMG_PLAYER1_PUSHING_RIGHT
+    EL_PLAYER_1,                               ACTION_PUSHING, MV_BIT_RIGHT,
+    IMG_PLAYER_1_PUSHING_RIGHT
   },
   {
-    EL_PLAYER1,                                        ACTION_SNAPPING, MV_BIT_DOWN,
-    IMG_PLAYER1_SNAPPING_DOWN
+    EL_PLAYER_1,                               ACTION_SNAPPING, MV_BIT_DOWN,
+    IMG_PLAYER_1_SNAPPING_DOWN
   },
   {
-    EL_PLAYER1,                                        ACTION_SNAPPING, MV_BIT_UP,
-    IMG_PLAYER1_SNAPPING_UP
+    EL_PLAYER_1,                               ACTION_SNAPPING, MV_BIT_UP,
+    IMG_PLAYER_1_SNAPPING_UP
   },
   {
-    EL_PLAYER1,                                        ACTION_SNAPPING, MV_BIT_LEFT,
-    IMG_PLAYER1_SNAPPING_LEFT
+    EL_PLAYER_1,                               ACTION_SNAPPING, MV_BIT_LEFT,
+    IMG_PLAYER_1_SNAPPING_LEFT
   },
   {
-    EL_PLAYER1,                                        ACTION_SNAPPING, MV_BIT_RIGHT,
-    IMG_PLAYER1_SNAPPING_RIGHT
+    EL_PLAYER_1,                               ACTION_SNAPPING, MV_BIT_RIGHT,
+    IMG_PLAYER_1_SNAPPING_RIGHT
   },
   {
-    EL_PLAYER2,                                        -1, -1,
-    IMG_PLAYER2
+    EL_PLAYER_2,                               -1, -1,
+    IMG_PLAYER_2
   },
   {
-    EL_PLAYER2,                                        -1, MV_BIT_DOWN,
-    IMG_PLAYER2_DOWN
+    EL_PLAYER_2,                               -1, MV_BIT_DOWN,
+    IMG_PLAYER_2_DOWN
   },
   {
-    EL_PLAYER2,                                        -1, MV_BIT_UP,
-    IMG_PLAYER2_UP
+    EL_PLAYER_2,                               -1, MV_BIT_UP,
+    IMG_PLAYER_2_UP
   },
   {
-    EL_PLAYER2,                                        -1, MV_BIT_LEFT,
-    IMG_PLAYER2_LEFT
+    EL_PLAYER_2,                               -1, MV_BIT_LEFT,
+    IMG_PLAYER_2_LEFT
   },
   {
-    EL_PLAYER2,                                        -1, MV_BIT_RIGHT,
-    IMG_PLAYER2_RIGHT
+    EL_PLAYER_2,                               -1, MV_BIT_RIGHT,
+    IMG_PLAYER_2_RIGHT
   },
   {
-    EL_PLAYER2,                                        ACTION_MOVING, MV_BIT_DOWN,
-    IMG_PLAYER2_MOVING_DOWN
+    EL_PLAYER_2,                               ACTION_MOVING, MV_BIT_DOWN,
+    IMG_PLAYER_2_MOVING_DOWN
   },
   {
-    EL_PLAYER2,                                        ACTION_MOVING, MV_BIT_UP,
-    IMG_PLAYER2_MOVING_UP
+    EL_PLAYER_2,                               ACTION_MOVING, MV_BIT_UP,
+    IMG_PLAYER_2_MOVING_UP
   },
   {
-    EL_PLAYER2,                                        ACTION_MOVING, MV_BIT_LEFT,
-    IMG_PLAYER2_MOVING_LEFT
+    EL_PLAYER_2,                               ACTION_MOVING, MV_BIT_LEFT,
+    IMG_PLAYER_2_MOVING_LEFT
   },
   {
-    EL_PLAYER2,                                        ACTION_MOVING, MV_BIT_RIGHT,
-    IMG_PLAYER2_MOVING_RIGHT
+    EL_PLAYER_2,                               ACTION_MOVING, MV_BIT_RIGHT,
+    IMG_PLAYER_2_MOVING_RIGHT
   },
   {
-    EL_PLAYER2,                                        ACTION_DIGGING, MV_BIT_DOWN,
-    IMG_PLAYER2_DIGGING_DOWN
+    EL_PLAYER_2,                               ACTION_DIGGING, MV_BIT_DOWN,
+    IMG_PLAYER_2_DIGGING_DOWN
   },
   {
-    EL_PLAYER2,                                        ACTION_DIGGING, MV_BIT_UP,
-    IMG_PLAYER2_DIGGING_UP
+    EL_PLAYER_2,                               ACTION_DIGGING, MV_BIT_UP,
+    IMG_PLAYER_2_DIGGING_UP
   },
   {
-    EL_PLAYER2,                                        ACTION_DIGGING, MV_BIT_LEFT,
-    IMG_PLAYER2_DIGGING_LEFT
+    EL_PLAYER_2,                               ACTION_DIGGING, MV_BIT_LEFT,
+    IMG_PLAYER_2_DIGGING_LEFT
   },
   {
-    EL_PLAYER2,                                        ACTION_DIGGING, MV_BIT_RIGHT,
-    IMG_PLAYER2_DIGGING_RIGHT
+    EL_PLAYER_2,                               ACTION_DIGGING, MV_BIT_RIGHT,
+    IMG_PLAYER_2_DIGGING_RIGHT
   },
   {
-    EL_PLAYER2,                                        ACTION_PUSHING, MV_BIT_DOWN,
-    IMG_PLAYER2_PUSHING_DOWN
+    EL_PLAYER_2,                               ACTION_PUSHING, MV_BIT_DOWN,
+    IMG_PLAYER_2_PUSHING_DOWN
   },
   {
-    EL_PLAYER2,                                        ACTION_PUSHING, MV_BIT_UP,
-    IMG_PLAYER2_PUSHING_UP
+    EL_PLAYER_2,                               ACTION_PUSHING, MV_BIT_UP,
+    IMG_PLAYER_2_PUSHING_UP
   },
   {
-    EL_PLAYER2,                                        ACTION_PUSHING, MV_BIT_LEFT,
-    IMG_PLAYER2_PUSHING_LEFT
+    EL_PLAYER_2,                               ACTION_PUSHING, MV_BIT_LEFT,
+    IMG_PLAYER_2_PUSHING_LEFT
   },
   {
-    EL_PLAYER2,                                        ACTION_PUSHING, MV_BIT_RIGHT,
-    IMG_PLAYER2_PUSHING_RIGHT
+    EL_PLAYER_2,                               ACTION_PUSHING, MV_BIT_RIGHT,
+    IMG_PLAYER_2_PUSHING_RIGHT
   },
   {
-    EL_PLAYER2,                                        ACTION_SNAPPING, MV_BIT_DOWN,
-    IMG_PLAYER2_SNAPPING_DOWN
+    EL_PLAYER_2,                               ACTION_SNAPPING, MV_BIT_DOWN,
+    IMG_PLAYER_2_SNAPPING_DOWN
   },
   {
-    EL_PLAYER2,                                        ACTION_SNAPPING, MV_BIT_UP,
-    IMG_PLAYER2_SNAPPING_UP
+    EL_PLAYER_2,                               ACTION_SNAPPING, MV_BIT_UP,
+    IMG_PLAYER_2_SNAPPING_UP
   },
   {
-    EL_PLAYER2,                                        ACTION_SNAPPING, MV_BIT_LEFT,
-    IMG_PLAYER2_SNAPPING_LEFT
+    EL_PLAYER_2,                               ACTION_SNAPPING, MV_BIT_LEFT,
+    IMG_PLAYER_2_SNAPPING_LEFT
   },
   {
-    EL_PLAYER2,                                        ACTION_SNAPPING, MV_BIT_RIGHT,
-    IMG_PLAYER2_SNAPPING_RIGHT
+    EL_PLAYER_2,                               ACTION_SNAPPING, MV_BIT_RIGHT,
+    IMG_PLAYER_2_SNAPPING_RIGHT
   },
   {
-    EL_PLAYER3,                                        -1, -1,
-    IMG_PLAYER3
+    EL_PLAYER_3,                               -1, -1,
+    IMG_PLAYER_3
   },
   {
-    EL_PLAYER3,                                        -1, MV_BIT_DOWN,
-    IMG_PLAYER3_DOWN
+    EL_PLAYER_3,                               -1, MV_BIT_DOWN,
+    IMG_PLAYER_3_DOWN
   },
   {
-    EL_PLAYER3,                                        -1, MV_BIT_UP,
-    IMG_PLAYER3_UP
+    EL_PLAYER_3,                               -1, MV_BIT_UP,
+    IMG_PLAYER_3_UP
   },
   {
-    EL_PLAYER3,                                        -1, MV_BIT_LEFT,
-    IMG_PLAYER3_LEFT
+    EL_PLAYER_3,                               -1, MV_BIT_LEFT,
+    IMG_PLAYER_3_LEFT
   },
   {
-    EL_PLAYER3,                                        -1, MV_BIT_RIGHT,
-    IMG_PLAYER3_RIGHT
+    EL_PLAYER_3,                               -1, MV_BIT_RIGHT,
+    IMG_PLAYER_3_RIGHT
   },
   {
-    EL_PLAYER3,                                        ACTION_MOVING, MV_BIT_DOWN,
-    IMG_PLAYER3_MOVING_DOWN
+    EL_PLAYER_3,                               ACTION_MOVING, MV_BIT_DOWN,
+    IMG_PLAYER_3_MOVING_DOWN
   },
   {
-    EL_PLAYER3,                                        ACTION_MOVING, MV_BIT_UP,
-    IMG_PLAYER3_MOVING_UP
+    EL_PLAYER_3,                               ACTION_MOVING, MV_BIT_UP,
+    IMG_PLAYER_3_MOVING_UP
   },
   {
-    EL_PLAYER3,                                        ACTION_MOVING, MV_BIT_LEFT,
-    IMG_PLAYER3_MOVING_LEFT
+    EL_PLAYER_3,                               ACTION_MOVING, MV_BIT_LEFT,
+    IMG_PLAYER_3_MOVING_LEFT
   },
   {
-    EL_PLAYER3,                                        ACTION_MOVING, MV_BIT_RIGHT,
-    IMG_PLAYER3_MOVING_RIGHT
+    EL_PLAYER_3,                               ACTION_MOVING, MV_BIT_RIGHT,
+    IMG_PLAYER_3_MOVING_RIGHT
   },
   {
-    EL_PLAYER3,                                        ACTION_DIGGING, MV_BIT_DOWN,
-    IMG_PLAYER3_DIGGING_DOWN
+    EL_PLAYER_3,                               ACTION_DIGGING, MV_BIT_DOWN,
+    IMG_PLAYER_3_DIGGING_DOWN
   },
   {
-    EL_PLAYER3,                                        ACTION_DIGGING, MV_BIT_UP,
-    IMG_PLAYER3_DIGGING_UP
+    EL_PLAYER_3,                               ACTION_DIGGING, MV_BIT_UP,
+    IMG_PLAYER_3_DIGGING_UP
   },
   {
-    EL_PLAYER3,                                        ACTION_DIGGING, MV_BIT_LEFT,
-    IMG_PLAYER3_DIGGING_LEFT
+    EL_PLAYER_3,                               ACTION_DIGGING, MV_BIT_LEFT,
+    IMG_PLAYER_3_DIGGING_LEFT
   },
   {
-    EL_PLAYER3,                                        ACTION_DIGGING, MV_BIT_RIGHT,
-    IMG_PLAYER3_DIGGING_RIGHT
+    EL_PLAYER_3,                               ACTION_DIGGING, MV_BIT_RIGHT,
+    IMG_PLAYER_3_DIGGING_RIGHT
   },
   {
-    EL_PLAYER3,                                        ACTION_PUSHING, MV_BIT_DOWN,
-    IMG_PLAYER3_PUSHING_DOWN
+    EL_PLAYER_3,                               ACTION_PUSHING, MV_BIT_DOWN,
+    IMG_PLAYER_3_PUSHING_DOWN
   },
   {
-    EL_PLAYER3,                                        ACTION_PUSHING, MV_BIT_UP,
-    IMG_PLAYER3_PUSHING_UP
+    EL_PLAYER_3,                               ACTION_PUSHING, MV_BIT_UP,
+    IMG_PLAYER_3_PUSHING_UP
   },
   {
-    EL_PLAYER3,                                        ACTION_PUSHING, MV_BIT_LEFT,
-    IMG_PLAYER3_PUSHING_LEFT
+    EL_PLAYER_3,                               ACTION_PUSHING, MV_BIT_LEFT,
+    IMG_PLAYER_3_PUSHING_LEFT
   },
   {
-    EL_PLAYER3,                                        ACTION_PUSHING, MV_BIT_RIGHT,
-    IMG_PLAYER3_PUSHING_RIGHT
+    EL_PLAYER_3,                               ACTION_PUSHING, MV_BIT_RIGHT,
+    IMG_PLAYER_3_PUSHING_RIGHT
   },
   {
-    EL_PLAYER3,                                        ACTION_SNAPPING, MV_BIT_DOWN,
-    IMG_PLAYER3_SNAPPING_DOWN
+    EL_PLAYER_3,                               ACTION_SNAPPING, MV_BIT_DOWN,
+    IMG_PLAYER_3_SNAPPING_DOWN
   },
   {
-    EL_PLAYER3,                                        ACTION_SNAPPING, MV_BIT_UP,
-    IMG_PLAYER3_SNAPPING_UP
+    EL_PLAYER_3,                               ACTION_SNAPPING, MV_BIT_UP,
+    IMG_PLAYER_3_SNAPPING_UP
   },
   {
-    EL_PLAYER3,                                        ACTION_SNAPPING, MV_BIT_LEFT,
-    IMG_PLAYER3_SNAPPING_LEFT
+    EL_PLAYER_3,                               ACTION_SNAPPING, MV_BIT_LEFT,
+    IMG_PLAYER_3_SNAPPING_LEFT
   },
   {
-    EL_PLAYER3,                                        ACTION_SNAPPING, MV_BIT_RIGHT,
-    IMG_PLAYER3_SNAPPING_RIGHT
+    EL_PLAYER_3,                               ACTION_SNAPPING, MV_BIT_RIGHT,
+    IMG_PLAYER_3_SNAPPING_RIGHT
   },
   {
-    EL_PLAYER4,                                        -1, -1,
-    IMG_PLAYER4
+    EL_PLAYER_4,                               -1, -1,
+    IMG_PLAYER_4
   },
   {
-    EL_PLAYER4,                                        -1, MV_BIT_DOWN,
-    IMG_PLAYER4_DOWN
+    EL_PLAYER_4,                               -1, MV_BIT_DOWN,
+    IMG_PLAYER_4_DOWN
   },
   {
-    EL_PLAYER4,                                        -1, MV_BIT_UP,
-    IMG_PLAYER4_UP
+    EL_PLAYER_4,                               -1, MV_BIT_UP,
+    IMG_PLAYER_4_UP
   },
   {
-    EL_PLAYER4,                                        -1, MV_BIT_LEFT,
-    IMG_PLAYER4_LEFT
+    EL_PLAYER_4,                               -1, MV_BIT_LEFT,
+    IMG_PLAYER_4_LEFT
   },
   {
-    EL_PLAYER4,                                        -1, MV_BIT_RIGHT,
-    IMG_PLAYER4_RIGHT
+    EL_PLAYER_4,                               -1, MV_BIT_RIGHT,
+    IMG_PLAYER_4_RIGHT
   },
   {
-    EL_PLAYER4,                                        ACTION_MOVING, MV_BIT_DOWN,
-    IMG_PLAYER4_MOVING_DOWN
+    EL_PLAYER_4,                               ACTION_MOVING, MV_BIT_DOWN,
+    IMG_PLAYER_4_MOVING_DOWN
   },
   {
-    EL_PLAYER4,                                        ACTION_MOVING, MV_BIT_UP,
-    IMG_PLAYER4_MOVING_UP
+    EL_PLAYER_4,                               ACTION_MOVING, MV_BIT_UP,
+    IMG_PLAYER_4_MOVING_UP
   },
   {
-    EL_PLAYER4,                                        ACTION_MOVING, MV_BIT_LEFT,
-    IMG_PLAYER4_MOVING_LEFT
+    EL_PLAYER_4,                               ACTION_MOVING, MV_BIT_LEFT,
+    IMG_PLAYER_4_MOVING_LEFT
   },
   {
-    EL_PLAYER4,                                        ACTION_MOVING, MV_BIT_RIGHT,
-    IMG_PLAYER4_MOVING_RIGHT
+    EL_PLAYER_4,                               ACTION_MOVING, MV_BIT_RIGHT,
+    IMG_PLAYER_4_MOVING_RIGHT
   },
   {
-    EL_PLAYER4,                                        ACTION_DIGGING, MV_BIT_DOWN,
-    IMG_PLAYER4_DIGGING_DOWN
+    EL_PLAYER_4,                               ACTION_DIGGING, MV_BIT_DOWN,
+    IMG_PLAYER_4_DIGGING_DOWN
   },
   {
-    EL_PLAYER4,                                        ACTION_DIGGING, MV_BIT_UP,
-    IMG_PLAYER4_DIGGING_UP
+    EL_PLAYER_4,                               ACTION_DIGGING, MV_BIT_UP,
+    IMG_PLAYER_4_DIGGING_UP
   },
   {
-    EL_PLAYER4,                                        ACTION_DIGGING, MV_BIT_LEFT,
-    IMG_PLAYER4_DIGGING_LEFT
+    EL_PLAYER_4,                               ACTION_DIGGING, MV_BIT_LEFT,
+    IMG_PLAYER_4_DIGGING_LEFT
   },
   {
-    EL_PLAYER4,                                        ACTION_DIGGING, MV_BIT_RIGHT,
-    IMG_PLAYER4_DIGGING_RIGHT
+    EL_PLAYER_4,                               ACTION_DIGGING, MV_BIT_RIGHT,
+    IMG_PLAYER_4_DIGGING_RIGHT
   },
   {
-    EL_PLAYER4,                                        ACTION_PUSHING, MV_BIT_DOWN,
-    IMG_PLAYER4_PUSHING_DOWN
+    EL_PLAYER_4,                               ACTION_PUSHING, MV_BIT_DOWN,
+    IMG_PLAYER_4_PUSHING_DOWN
   },
   {
-    EL_PLAYER4,                                        ACTION_PUSHING, MV_BIT_UP,
-    IMG_PLAYER4_PUSHING_UP
+    EL_PLAYER_4,                               ACTION_PUSHING, MV_BIT_UP,
+    IMG_PLAYER_4_PUSHING_UP
   },
   {
-    EL_PLAYER4,                                        ACTION_PUSHING, MV_BIT_LEFT,
-    IMG_PLAYER4_PUSHING_LEFT
+    EL_PLAYER_4,                               ACTION_PUSHING, MV_BIT_LEFT,
+    IMG_PLAYER_4_PUSHING_LEFT
   },
   {
-    EL_PLAYER4,                                        ACTION_PUSHING, MV_BIT_RIGHT,
-    IMG_PLAYER4_PUSHING_RIGHT
+    EL_PLAYER_4,                               ACTION_PUSHING, MV_BIT_RIGHT,
+    IMG_PLAYER_4_PUSHING_RIGHT
   },
   {
-    EL_PLAYER4,                                        ACTION_SNAPPING, MV_BIT_DOWN,
-    IMG_PLAYER4_SNAPPING_DOWN
+    EL_PLAYER_4,                               ACTION_SNAPPING, MV_BIT_DOWN,
+    IMG_PLAYER_4_SNAPPING_DOWN
   },
   {
-    EL_PLAYER4,                                        ACTION_SNAPPING, MV_BIT_UP,
-    IMG_PLAYER4_SNAPPING_UP
+    EL_PLAYER_4,                               ACTION_SNAPPING, MV_BIT_UP,
+    IMG_PLAYER_4_SNAPPING_UP
   },
   {
-    EL_PLAYER4,                                        ACTION_SNAPPING, MV_BIT_LEFT,
-    IMG_PLAYER4_SNAPPING_LEFT
+    EL_PLAYER_4,                               ACTION_SNAPPING, MV_BIT_LEFT,
+    IMG_PLAYER_4_SNAPPING_LEFT
   },
   {
-    EL_PLAYER4,                                        ACTION_SNAPPING, MV_BIT_RIGHT,
-    IMG_PLAYER4_SNAPPING_RIGHT
+    EL_PLAYER_4,                               ACTION_SNAPPING, MV_BIT_RIGHT,
+    IMG_PLAYER_4_SNAPPING_RIGHT
   },
   {
     EL_EXPLOSION,                              -1, -1,
@@ -2245,20 +2257,20 @@ element_to_graphic[] =
     IMG_CHAR_QUESTION
   },
   {
-    EL_EM_KEY1_FILE,                           -1, -1,
-    IMG_EM_KEY1
+    EL_EM_KEY_1_FILE,                          -1, -1,
+    IMG_EM_KEY_1
   },
   {
-    EL_EM_KEY2_FILE,                           -1, -1,
-    IMG_EM_KEY2
+    EL_EM_KEY_2_FILE,                          -1, -1,
+    IMG_EM_KEY_2
   },
   {
-    EL_EM_KEY3_FILE,                           -1, -1,
-    IMG_EM_KEY3
+    EL_EM_KEY_3_FILE,                          -1, -1,
+    IMG_EM_KEY_3
   },
   {
-    EL_EM_KEY4_FILE,                           -1, -1,
-    IMG_EM_KEY4
+    EL_EM_KEY_4_FILE,                          -1, -1,
+    IMG_EM_KEY_4
   },
   {
     EL_KEY_WHITE,                              -1, -1,