rnd-20020921-1-src
authorHolger Schemel <info@artsoft.org>
Fri, 20 Sep 2002 22:13:35 +0000 (00:13 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:38:33 +0000 (10:38 +0200)
src/conftime.h
src/editor.c
src/files.c
src/game.c
src/init.c
src/main.c
src/main.h
src/tools.c

index ee70587904bf11fe474ebd50f7b4a5abe03ee979..0fd4cb764602a34a886331b02ca92d7966aa0b23 100644 (file)
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2002-09-20 01:18]"
+#define COMPILE_DATE_STRING "[2002-09-21 00:02]"
index cf287ec8e82456497d57234c75a3fbee052079f7..922dfe0699deaf9c27600642299f01c2b3531cc1 100644 (file)
@@ -764,7 +764,7 @@ int editor_element[] =
   EL_EXIT_CLOSED,
   EL_EXIT_OPEN,
 
-  EL_EDELSTEIN_BD,
+  EL_BD_DIAMOND,
   EL_BUTTERFLY_UP,
   EL_FIREFLY_UP,
   EL_BD_ROCK,
@@ -794,10 +794,10 @@ int editor_element[] =
   EL_CHAR('N'),
   EL_CHAR('E'),
 
-  EL_SPIELER1,
-  EL_SPIELER2,
-  EL_SPIELER3,
-  EL_SPIELER4,
+  EL_PLAYER1,
+  EL_PLAYER2,
+  EL_PLAYER3,
+  EL_PLAYER4,
 
   EL_PLAYER,
   EL_EMPTY,
@@ -854,15 +854,15 @@ int editor_element[] =
   EL_AMOEBA_WET,
   EL_AMOEBA_DRY,
 
-  EL_EM_KEY_1_FILE,
-  EL_EM_KEY_2_FILE,
-  EL_EM_KEY_3_FILE,
-  EL_EM_KEY_4_FILE,
+  EL_EM_KEY1_FILE,
+  EL_EM_KEY2_FILE,
+  EL_EM_KEY3_FILE,
+  EL_EM_KEY4_FILE,
 
-  EL_EM_GATE_1,
-  EL_EM_GATE_2,
-  EL_EM_GATE_3,
-  EL_EM_GATE_4,
+  EL_EM_GATE1,
+  EL_EM_GATE2,
+  EL_EM_GATE3,
+  EL_EM_GATE4,
 
   EL_EM_GATE1_GRAY,
   EL_EM_GATE2_GRAY,
@@ -889,15 +889,15 @@ int editor_element[] =
   EL_GATE3_GRAY,
   EL_GATE4_GRAY,
 
-  EL_PFEIL_LEFT,
-  EL_PFEIL_RIGHT,
-  EL_PFEIL_UP,
-  EL_PFEIL_DOWN,
+  EL_ARROW_LEFT,
+  EL_ARROW_RIGHT,
+  EL_ARROW_UP,
+  EL_ARROW_DOWN,
 
   EL_AMOEBA_FULL,
-  EL_EDELSTEIN_YELLOW,
-  EL_EDELSTEIN_RED,
-  EL_EDELSTEIN_PURPLE,
+  EL_EMERALD_YELLOW,
+  EL_EMERALD_RED,
+  EL_EMERALD_PURPLE,
 
   EL_WALL_BD_DIAMOND,
   EL_WALL_EMERALD_YELLOW,
@@ -912,7 +912,7 @@ int editor_element[] =
   EL_PACMAN_LEFT,
   EL_DARK_YAMYAM,
   EL_PACMAN_RIGHT,
-  EL_MAUER_LEBT,
+  EL_WALL_GROWING,
 
   EL_BIOMAZE,
   EL_PACMAN_DOWN,
@@ -922,12 +922,12 @@ int editor_element[] =
   EL_DYNABOMB_NR,
   EL_DYNABOMB_SZ,
   EL_DYNABOMB_XL,
-  EL_BADEWANNE,
+  EL_STONEBLOCK,
 
   EL_MOLE,
-  EL_PINGUIN,
-  EL_SCHWEIN,
-  EL_DRACHE,
+  EL_PENGUIN,
+  EL_PIG,
+  EL_DRAGON,
 
   EL_EMPTY,
   EL_MOLE_UP,
@@ -949,25 +949,25 @@ int editor_element[] =
   EL_BALLOON_SEND_UP,
   EL_BALLOON_SEND_DOWN,
 
-  EL_SONDE,
-  EL_MAUER_X,
-  EL_MAUER_Y,
-  EL_MAUER_XY,
+  EL_SATELLITE,
+  EL_WALL_GROWING_X,
+  EL_WALL_GROWING_Y,
+  EL_WALL_GROWING_XY,
 
-  EL_INVISIBLE_STEEL,
+  EL_INVISIBLE_STEELWALL,
   EL_INVISIBLE_WALL,
   EL_SPEED_PILL,
   EL_BLACK_ORB,
 
-  EL_EMC_STEEL_WALL_1,
-  EL_EMC_WALL_1,
-  EL_EMC_WALL_2,
-  EL_EMC_WALL_3,
+  EL_EMC_STEELWALL1,
+  EL_EMC_WALL_PILLAR_UPPER,
+  EL_EMC_WALL_PILLAR_MIDDLE,
+  EL_EMC_WALL_PILLAR_LOWER,
 
-  EL_EMC_WALL_4,
-  EL_EMC_WALL_5,
-  EL_EMC_WALL_6,
-  EL_EMC_WALL_7,
+  EL_EMC_WALL4,
+  EL_EMC_WALL5,
+  EL_EMC_WALL6,
+  EL_EMC_WALL7,
 
 
   EL_CHAR('S'),
@@ -1003,7 +1003,7 @@ int editor_element[] =
   EL_SP_INFOTRON,
   EL_SP_CHIP_SINGLE,
   EL_SP_HARD_GRAY,
-  EL_SP_EXIT,
+  EL_SP_EXIT_CLOSED,
 
   EL_SP_DISK_ORANGE,
   EL_SP_PORT1_RIGHT,
@@ -1070,39 +1070,39 @@ int editor_element[] =
   EL_WALL_PEARL,
   EL_WALL_CRYSTAL,
 
-  EL_BELT1_LEFT,
-  EL_BELT1_MIDDLE,
-  EL_BELT1_RIGHT,
-  EL_BELT1_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT1_LEFT,
+  EL_CONVEYOR_BELT1_MIDDLE,
+  EL_CONVEYOR_BELT1_RIGHT,
+  EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
 
-  EL_BELT2_LEFT,
-  EL_BELT2_MIDDLE,
-  EL_BELT2_RIGHT,
-  EL_BELT2_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT2_LEFT,
+  EL_CONVEYOR_BELT2_MIDDLE,
+  EL_CONVEYOR_BELT2_RIGHT,
+  EL_CONVEYOR_BELT2_SWITCH_MIDDLE,
 
-  EL_BELT3_LEFT,
-  EL_BELT3_MIDDLE,
-  EL_BELT3_RIGHT,
-  EL_BELT3_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT3_LEFT,
+  EL_CONVEYOR_BELT3_MIDDLE,
+  EL_CONVEYOR_BELT3_RIGHT,
+  EL_CONVEYOR_BELT3_SWITCH_MIDDLE,
 
-  EL_BELT4_LEFT,
-  EL_BELT4_MIDDLE,
-  EL_BELT4_RIGHT,
-  EL_BELT4_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT4_LEFT,
+  EL_CONVEYOR_BELT4_MIDDLE,
+  EL_CONVEYOR_BELT4_RIGHT,
+  EL_CONVEYOR_BELT4_SWITCH_MIDDLE,
 
-  EL_BELT1_SWITCH_LEFT,
-  EL_BELT2_SWITCH_LEFT,
-  EL_BELT3_SWITCH_LEFT,
-  EL_BELT4_SWITCH_LEFT,
+  EL_CONVEYOR_BELT1_SWITCH_LEFT,
+  EL_CONVEYOR_BELT2_SWITCH_LEFT,
+  EL_CONVEYOR_BELT3_SWITCH_LEFT,
+  EL_CONVEYOR_BELT4_SWITCH_LEFT,
 
-  EL_BELT1_SWITCH_RIGHT,
-  EL_BELT2_SWITCH_RIGHT,
-  EL_BELT3_SWITCH_RIGHT,
-  EL_BELT4_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT1_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT2_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT3_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT4_SWITCH_RIGHT,
 
   EL_SWITCHGATE_OPEN,
   EL_SWITCHGATE_CLOSED,
-  EL_SWITCHGATE_SWITCH_1,
+  EL_SWITCHGATE_SWITCH_UP,
   EL_ENVELOPE,
 
   EL_TIMEGATE_CLOSED,
@@ -1112,15 +1112,15 @@ int editor_element[] =
 
   EL_LANDMINE,
   EL_SAND_INVISIBLE,
-  EL_STEEL_SLANTED,
+  EL_STEELWALL_SLANTED,
   EL_EMPTY,
 
   EL_SIGN_EXCLAMATION,
   EL_SIGN_STOP,
-  EL_LIGHT_SWITCH_OFF,
-  EL_LIGHT_SWITCH_ON,
+  EL_LIGHT_SWITCH,
+  EL_LIGHT_SWITCH_ACTIVE,
 
-  EL_SHIELD_PASSIVE,
+  EL_SHIELD_NORMAL,
   EL_SHIELD_ACTIVE,
   EL_EXTRA_TIME,
   EL_EMPTY,
@@ -2102,7 +2102,7 @@ static boolean LevelContainsPlayer()
   for(y=0; y<lev_fieldy; y++) 
     for(x=0; x<lev_fieldx; x++)
       if (Feld[x][y] == EL_PLAYER ||
-         Feld[x][y] == EL_SPIELER1 ||
+         Feld[x][y] == EL_PLAYER1 ||
          Feld[x][y] == EL_SP_MURPHY) 
        player_found = TRUE;
 
@@ -2611,10 +2611,10 @@ static void DrawPropertiesWindow()
   } elements_with_counter[] =
   {
     { EL_EMERALD,      &level.score[SC_EDELSTEIN],     TEXT_COLLECTING },
-    { EL_EDELSTEIN_BD, &level.score[SC_EDELSTEIN],     TEXT_COLLECTING },
-    { EL_EDELSTEIN_YELLOW,&level.score[SC_EDELSTEIN],  TEXT_COLLECTING },
-    { EL_EDELSTEIN_RED,        &level.score[SC_EDELSTEIN],     TEXT_COLLECTING },
-    { EL_EDELSTEIN_PURPLE,&level.score[SC_EDELSTEIN],  TEXT_COLLECTING },
+    { EL_BD_DIAMOND,   &level.score[SC_EDELSTEIN],     TEXT_COLLECTING },
+    { EL_EMERALD_YELLOW,&level.score[SC_EDELSTEIN],    TEXT_COLLECTING },
+    { EL_EMERALD_RED,  &level.score[SC_EDELSTEIN],     TEXT_COLLECTING },
+    { EL_EMERALD_PURPLE,&level.score[SC_EDELSTEIN],    TEXT_COLLECTING },
     { EL_DIAMOND,      &level.score[SC_DIAMANT],       TEXT_COLLECTING },
     { EL_BUG_RIGHT,    &level.score[SC_KAEFER],        TEXT_SMASHING },
     { EL_BUG_UP,       &level.score[SC_KAEFER],        TEXT_SMASHING },
@@ -2645,10 +2645,10 @@ static void DrawPropertiesWindow()
     { EL_KEY2,         &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
     { EL_KEY3,         &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
     { EL_KEY4,         &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
-    { EL_EM_KEY_1_FILE,        &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
-    { EL_EM_KEY_2_FILE,        &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
-    { EL_EM_KEY_3_FILE,        &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
-    { EL_EM_KEY_4_FILE,        &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
+    { EL_EM_KEY1_FILE, &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
+    { EL_EM_KEY2_FILE, &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
+    { EL_EM_KEY3_FILE, &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
+    { EL_EM_KEY4_FILE, &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
     { EL_AMOEBA_WET,   &level.amoeba_speed,            TEXT_SPEED },
     { EL_AMOEBA_DRY,   &level.amoeba_speed,            TEXT_SPEED },
     { EL_AMOEBA_FULL,  &level.amoeba_speed,            TEXT_SPEED },
@@ -3143,7 +3143,7 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
   else if (letter == 'ü' || letter == 'Ü')
     letter_element = EL_CHAR_UE;
   else if (letter == '^')
-    letter_element = EL_CHAR_COPY;
+    letter_element = EL_CHAR_COPYRIGHT;
   else
     letter_element = EL_CHAR_ASCII0 + letter;
 
@@ -3454,7 +3454,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
            {
              for(x=0; x<lev_fieldx; x++)
              {
-               if (Feld[x][y] == EL_PLAYER || Feld[x][y] == EL_SPIELER1)
+               if (Feld[x][y] == EL_PLAYER || Feld[x][y] == EL_PLAYER1)
                {
                  Feld[x][y] = EL_EMPTY;
                  if (x - level_xpos >= 0 && x - level_xpos < ed_fieldx &&
index fd392ec8abec1d554c94246e2dc520a3f2fa7ea5..f5daeb4a3d545c97a6b24eba470ccdb2daeac5ca 100644 (file)
@@ -58,7 +58,7 @@ static void setLevelInfoToDefaults()
 
   for(x=0; x<MAX_LEV_FIELDX; x++)
     for(y=0; y<MAX_LEV_FIELDY; y++)
-      Feld[x][y] = Ur[x][y] = EL_ERDREICH;
+      Feld[x][y] = Ur[x][y] = EL_SAND;
 
   level.time = 100;
   level.gems_needed = 0;
@@ -67,7 +67,7 @@ static void setLevelInfoToDefaults()
   level.time_wheel = 10;
   level.time_light = 10;
   level.time_timegate = 10;
-  level.amoeba_content = EL_DIAMANT;
+  level.amoeba_content = EL_DIAMOND;
   level.double_speed = FALSE;
   level.gravity = FALSE;
   level.em_slippery_gems = FALSE;
@@ -94,7 +94,7 @@ static void setLevelInfoToDefaults()
   Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] =
     Ur[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = EL_EXIT_CLOSED;
 
-  BorderElement = EL_BETON;
+  BorderElement = EL_STEELWALL;
 
   /* try to determine better author name than 'anonymous' */
   if (strcmp(leveldir_current->author, ANONYMOUS_NAME) != 0)
@@ -132,7 +132,7 @@ static int checkLevelElement(int element)
   if (element >= EL_FIRST_RUNTIME)
   {
     Error(ERR_WARN, "invalid level element %d", element);
-    element = EL_CHAR_FRAGE;
+    element = EL_CHAR_QUESTION;
   }
 
   return element;
@@ -292,7 +292,7 @@ static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level)
        for(x=0; x<3; x++)
          level->yam_content[i][x][y] = content_array[i][x][y];
   }
-  else if (element == EL_AMOEBE_BD)
+  else if (element == EL_BD_AMOEBA)
   {
     level->amoeba_content = content_array[0][0][0];
   }
@@ -574,7 +574,7 @@ static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
        for(x=0; x<3; x++)
          content_array[i][x][y] = level->yam_content[i][x][y];
   }
-  else if (element == EL_AMOEBE_BD)
+  else if (element == EL_BD_AMOEBA)
   {
     num_contents = 1;
     content_xsize = 1;
@@ -672,7 +672,7 @@ void SaveLevel(int level_nr)
   if (level.encoding_16bit_amoeba)
   {
     putFileChunkBE(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE);
-    SaveLevel_CNT2(file, &level, EL_AMOEBE_BD);
+    SaveLevel_CNT2(file, &level, EL_BD_AMOEBA);
   }
 
   fclose(file);
index e3b13f74cd8fc4113f565a013897eb8a54d0dc8b..c9ee2c61d5e90ff2d8eb0775716f466abbb9e046 100644 (file)
@@ -231,26 +231,26 @@ void GetPlayerConfig()
 
 static int getBeltNrFromElement(int element)
 {
-  return (element < EL_BELT2_LEFT ? 0 :
-         element < EL_BELT3_LEFT ? 1 :
-         element < EL_BELT4_LEFT ? 2 : 3);
+  return (element < EL_CONVEYOR_BELT2_LEFT ? 0 :
+         element < EL_CONVEYOR_BELT3_LEFT ? 1 :
+         element < EL_CONVEYOR_BELT4_LEFT ? 2 : 3);
 }
 
 static int getBeltNrFromSwitchElement(int element)
 {
-  return (element < EL_BELT2_SWITCH_LEFT ? 0 :
-         element < EL_BELT3_SWITCH_LEFT ? 1 :
-         element < EL_BELT4_SWITCH_LEFT ? 2 : 3);
+  return (element < EL_CONVEYOR_BELT2_SWITCH_LEFT ? 0 :
+         element < EL_CONVEYOR_BELT3_SWITCH_LEFT ? 1 :
+         element < EL_CONVEYOR_BELT4_SWITCH_LEFT ? 2 : 3);
 }
 
 static int getBeltDirNrFromSwitchElement(int element)
 {
   static int belt_base_element[4] =
   {
-    EL_BELT1_SWITCH_LEFT,
-    EL_BELT2_SWITCH_LEFT,
-    EL_BELT3_SWITCH_LEFT,
-    EL_BELT4_SWITCH_LEFT
+    EL_CONVEYOR_BELT1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT4_SWITCH_LEFT
   };
 
   int belt_nr = getBeltNrFromSwitchElement(element);
@@ -289,15 +289,15 @@ static void InitField(int x, int y, boolean init_game)
       /* no break! */
     case EL_PLAYER:
       if (init_game)
-       Feld[x][y] = EL_SPIELER1;
+       Feld[x][y] = EL_PLAYER1;
       /* no break! */
-    case EL_SPIELER1:
-    case EL_SPIELER2:
-    case EL_SPIELER3:
-    case EL_SPIELER4:
+    case EL_PLAYER1:
+    case EL_PLAYER2:
+    case EL_PLAYER3:
+    case EL_PLAYER4:
       if (init_game)
       {
-       struct PlayerInfo *player = &stored_player[Feld[x][y] - EL_SPIELER1];
+       struct PlayerInfo *player = &stored_player[Feld[x][y] - EL_PLAYER1];
        int jx = player->jx, jy = player->jy;
 
        player->present = TRUE;
@@ -403,12 +403,12 @@ static void InitField(int x, int y, boolean init_game)
       local_player->sokobanfields_still_needed++;
       break;
 
-    case EL_PINGUIN:
+    case EL_PENGUIN:
       local_player->friends_still_needed++;
       break;
 
-    case EL_SCHWEIN:
-    case EL_DRACHE:
+    case EL_PIG:
+    case EL_DRAGON:
       MovDir[x][y] = 1 << RND(4);
       break;
 
@@ -416,31 +416,31 @@ static void InitField(int x, int y, boolean init_game)
       Feld[x][y] = EL_EMPTY;
       break;
 
-    case EL_EM_KEY_1_FILE:
-      Feld[x][y] = EL_EM_KEY_1;
+    case EL_EM_KEY1_FILE:
+      Feld[x][y] = EL_EM_KEY1;
       break;
-    case EL_EM_KEY_2_FILE:
-      Feld[x][y] = EL_EM_KEY_2;
+    case EL_EM_KEY2_FILE:
+      Feld[x][y] = EL_EM_KEY2;
       break;
-    case EL_EM_KEY_3_FILE:
-      Feld[x][y] = EL_EM_KEY_3;
+    case EL_EM_KEY3_FILE:
+      Feld[x][y] = EL_EM_KEY3;
       break;
-    case EL_EM_KEY_4_FILE:
-      Feld[x][y] = EL_EM_KEY_4;
+    case EL_EM_KEY4_FILE:
+      Feld[x][y] = EL_EM_KEY4;
       break;
 
-    case EL_BELT1_SWITCH_LEFT:
-    case EL_BELT1_SWITCH_MIDDLE:
-    case EL_BELT1_SWITCH_RIGHT:
-    case EL_BELT2_SWITCH_LEFT:
-    case EL_BELT2_SWITCH_MIDDLE:
-    case EL_BELT2_SWITCH_RIGHT:
-    case EL_BELT3_SWITCH_LEFT:
-    case EL_BELT3_SWITCH_MIDDLE:
-    case EL_BELT3_SWITCH_RIGHT:
-    case EL_BELT4_SWITCH_LEFT:
-    case EL_BELT4_SWITCH_MIDDLE:
-    case EL_BELT4_SWITCH_RIGHT:
+    case EL_CONVEYOR_BELT1_SWITCH_LEFT:
+    case EL_CONVEYOR_BELT1_SWITCH_MIDDLE:
+    case EL_CONVEYOR_BELT1_SWITCH_RIGHT:
+    case EL_CONVEYOR_BELT2_SWITCH_LEFT:
+    case EL_CONVEYOR_BELT2_SWITCH_MIDDLE:
+    case EL_CONVEYOR_BELT2_SWITCH_RIGHT:
+    case EL_CONVEYOR_BELT3_SWITCH_LEFT:
+    case EL_CONVEYOR_BELT3_SWITCH_MIDDLE:
+    case EL_CONVEYOR_BELT3_SWITCH_RIGHT:
+    case EL_CONVEYOR_BELT4_SWITCH_LEFT:
+    case EL_CONVEYOR_BELT4_SWITCH_MIDDLE:
+    case EL_CONVEYOR_BELT4_SWITCH_RIGHT:
       if (init_game)
       {
        int belt_nr = getBeltNrFromSwitchElement(Feld[x][y]);
@@ -459,12 +459,12 @@ static void InitField(int x, int y, boolean init_game)
       }
       break;
 
-    case EL_SWITCHGATE_SWITCH_2:       /* always start with same switch pos */
+    case EL_SWITCHGATE_SWITCH_DOWN:    /* always start with same switch pos */
       if (init_game)
-       Feld[x][y] = EL_SWITCHGATE_SWITCH_1;
+       Feld[x][y] = EL_SWITCHGATE_SWITCH_UP;
       break;
 
-    case EL_LIGHT_SWITCH_ON:
+    case EL_LIGHT_SWITCH_ACTIVE:
       if (init_game)
        game.light_time_left = level.time_light * FRAMES_PER_SECOND;
       break;
@@ -623,10 +623,10 @@ static void InitGameEngine()
     {
       EL_STEELWALL,
       EL_WALL,
-      EL_MAUER_LEBT,
-      EL_MAUER_X,
-      EL_MAUER_Y,
-      EL_MAUER_XY
+      EL_WALL_GROWING,
+      EL_WALL_GROWING_X,
+      EL_WALL_GROWING_Y,
+      EL_WALL_GROWING_XY
     };
     static int ep_em_slippery_wall_num = SIZEOF_ARRAY_INT(ep_em_slippery_wall);
 
@@ -682,7 +682,7 @@ void InitGame()
     struct PlayerInfo *player = &stored_player[i];
 
     player->index_nr = i;
-    player->element_nr = EL_SPIELER1 + i;
+    player->element_nr = EL_PLAYER1 + i;
 
     player->present = FALSE;
     player->active = FALSE;
@@ -1480,7 +1480,7 @@ void CheckDynamite(int x, int y)
     if (MovDelay[x][y])
     {
       if (!(MovDelay[x][y] % 6))
-       PlaySoundLevelAction(x, y, SND_ACTION_BURNING);
+       PlaySoundLevelAction(x, y, SND_ACTION_ACTIVE);
 
       if (IS_ACTIVE_BOMB(Feld[x][y]))
       {
@@ -1495,9 +1495,9 @@ void CheckDynamite(int x, int y)
   }
 
   if (Feld[x][y] == EL_DYNAMITE_ACTIVE)
-    StopSound(SND_DYNAMITE_BURNING);
+    StopSound(SND_DYNAMITE_ACTIVE);
   else
-    StopSound(SND_DYNABOMB_BURNING);
+    StopSound(SND_DYNABOMB_ACTIVE);
 
   Bang(x, y);
 }
@@ -1533,7 +1533,7 @@ void Explode(int ex, int ey, int phase, int mode)
       int element;
 
       if (!IN_LEV_FIELD(x, y) ||
-         ((mode != EX_NORMAL || center_element == EL_AMOEBA2DIAM) &&
+         ((mode != EX_NORMAL || center_element == EL_AMOEBA_TO_DIAMOND) &&
           (x != ex || y != ey)))
        continue;
 
@@ -1567,18 +1567,18 @@ void Explode(int ex, int ey, int phase, int mode)
       {
        switch(StorePlayer[ex][ey])
        {
-         case EL_SPIELER2:
-           Store[x][y] = EL_EDELSTEIN_RED;
+         case EL_PLAYER2:
+           Store[x][y] = EL_EMERALD_RED;
            break;
-         case EL_SPIELER3:
+         case EL_PLAYER3:
            Store[x][y] = EL_EMERALD;
            break;
-         case EL_SPIELER4:
-           Store[x][y] = EL_EDELSTEIN_PURPLE;
+         case EL_PLAYER4:
+           Store[x][y] = EL_EMERALD_PURPLE;
            break;
-         case EL_SPIELER1:
+         case EL_PLAYER1:
          default:
-           Store[x][y] = EL_EDELSTEIN_YELLOW;
+           Store[x][y] = EL_EMERALD_YELLOW;
            break;
        }
 
@@ -1586,31 +1586,31 @@ void Explode(int ex, int ey, int phase, int mode)
          Store[x][y] = EL_EMPTY;
       }
       else if (center_element == EL_MOLE)
-       Store[x][y] = EL_EDELSTEIN_RED;
-      else if (center_element == EL_PINGUIN)
-       Store[x][y] = EL_EDELSTEIN_PURPLE;
+       Store[x][y] = EL_EMERALD_RED;
+      else if (center_element == EL_PENGUIN)
+       Store[x][y] = EL_EMERALD_PURPLE;
       else if (center_element == EL_BUG)
        Store[x][y] = ((x == ex && y == ey) ? EL_DIAMOND : EL_EMERALD);
       else if (center_element == EL_BUTTERFLY)
-       Store[x][y] = EL_EDELSTEIN_BD;
+       Store[x][y] = EL_BD_DIAMOND;
       else if (center_element == EL_SP_ELECTRON)
        Store[x][y] = EL_SP_INFOTRON;
       else if (center_element == EL_YAMYAM)
        Store[x][y] = level.yam_content[game.yam_content_nr][x-ex+1][y-ey+1];
-      else if (center_element == EL_AMOEBA2DIAM)
+      else if (center_element == EL_AMOEBA_TO_DIAMOND)
        Store[x][y] = level.amoeba_content;
       else if (element == EL_WALL_EMERALD)
        Store[x][y] = EL_EMERALD;
       else if (element == EL_WALL_DIAMOND)
        Store[x][y] = EL_DIAMOND;
       else if (element == EL_WALL_BD_DIAMOND)
-       Store[x][y] = EL_EDELSTEIN_BD;
+       Store[x][y] = EL_BD_DIAMOND;
       else if (element == EL_WALL_EMERALD_YELLOW)
-       Store[x][y] = EL_EDELSTEIN_YELLOW;
+       Store[x][y] = EL_EMERALD_YELLOW;
       else if (element == EL_WALL_EMERALD_RED)
-       Store[x][y] = EL_EDELSTEIN_RED;
+       Store[x][y] = EL_EMERALD_RED;
       else if (element == EL_WALL_EMERALD_PURPLE)
-       Store[x][y] = EL_EDELSTEIN_PURPLE;
+       Store[x][y] = EL_EMERALD_PURPLE;
       else if (element == EL_WALL_PEARL)
        Store[x][y] = EL_PEARL;
       else if (element == EL_WALL_CRYSTAL)
@@ -1619,7 +1619,7 @@ void Explode(int ex, int ey, int phase, int mode)
        Store[x][y] = EL_EMPTY;
 
       if (x != ex || y != ey ||
-         center_element == EL_AMOEBA2DIAM || mode == EX_BORDER)
+         center_element == EL_AMOEBA_TO_DIAMOND || mode == EX_BORDER)
        Store2[x][y] = element;
 
       if (AmoebaNr[x][y] &&
@@ -1675,7 +1675,7 @@ void Explode(int ex, int ey, int phase, int mode)
       Store2[x][y] = 0;
       Bang(x, y);
     }
-    else if (element == EL_AMOEBA2DIAM)
+    else if (element == EL_AMOEBA_TO_DIAMOND)
       AmoebeUmwandeln(x, y);
   }
 
@@ -1807,7 +1807,7 @@ void Bang(int x, int y)
     case EL_DYNABOMB_XL:
       DynaExplode(x, y);
       break;
-    case EL_PINGUIN:
+    case EL_PENGUIN:
     case EL_LAMP:
     case EL_LAMP_ACTIVE:
       if (IS_PLAYER(x, y))
@@ -1867,10 +1867,10 @@ static void ToggleBeltSwitch(int x, int y)
 {
   static int belt_base_element[4] =
   {
-    EL_BELT1_SWITCH_LEFT,
-    EL_BELT2_SWITCH_LEFT,
-    EL_BELT3_SWITCH_LEFT,
-    EL_BELT4_SWITCH_LEFT
+    EL_CONVEYOR_BELT1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT4_SWITCH_LEFT
   };
   static int belt_move_dir[4] =
   {
@@ -1934,10 +1934,10 @@ static void ToggleSwitchgateSwitch(int x, int y)
     {
       int element = Feld[xx][yy];
 
-      if (element == EL_SWITCHGATE_SWITCH_1 ||
-         element == EL_SWITCHGATE_SWITCH_2)
+      if (element == EL_SWITCHGATE_SWITCH_UP ||
+         element == EL_SWITCHGATE_SWITCH_DOWN)
       {
-       Feld[xx][yy] = EL_SWITCHGATE_SWITCH_1 + game.switchgate_pos;
+       Feld[xx][yy] = EL_SWITCHGATE_SWITCH_UP + game.switchgate_pos;
        DrawLevelField(xx, yy);
       }
       else if (element == EL_SWITCHGATE_OPEN ||
@@ -1966,20 +1966,20 @@ static void RedrawAllLightSwitchesAndInvisibleElements()
     {
       int element = Feld[x][y];
 
-      if (element == EL_LIGHT_SWITCH_OFF &&
+      if (element == EL_LIGHT_SWITCH &&
          game.light_time_left > 0)
       {
-       Feld[x][y] = EL_LIGHT_SWITCH_ON;
+       Feld[x][y] = EL_LIGHT_SWITCH_ACTIVE;
        DrawLevelField(x, y);
       }
-      else if (element == EL_LIGHT_SWITCH_ON &&
+      else if (element == EL_LIGHT_SWITCH_ACTIVE &&
               game.light_time_left == 0)
       {
-       Feld[x][y] = EL_LIGHT_SWITCH_OFF;
+       Feld[x][y] = EL_LIGHT_SWITCH;
        DrawLevelField(x, y);
       }
 
-      if (element == EL_INVISIBLE_STEEL ||
+      if (element == EL_INVISIBLE_STEELWALL ||
          element == EL_INVISIBLE_WALL ||
          element == EL_SAND_INVISIBLE)
        DrawLevelField(x, y);
@@ -1992,7 +1992,7 @@ static void ToggleLightSwitch(int x, int y)
   int element = Feld[x][y];
 
   game.light_time_left =
-    (element == EL_LIGHT_SWITCH_OFF ?
+    (element == EL_LIGHT_SWITCH ?
      level.time_light * FRAMES_PER_SECOND : 0);
 
   RedrawAllLightSwitchesAndInvisibleElements();
@@ -2075,7 +2075,7 @@ void Impact(int x, int y)
   {
     if (object_hit && IS_PLAYER(x, y+1))
       KillHeroUnlessProtected(x, y+1);
-    else if (object_hit && smashed == EL_PINGUIN)
+    else if (object_hit && smashed == EL_PENGUIN)
       Bang(x, y+1);
     else
     {
@@ -2114,12 +2114,12 @@ void Impact(int x, int y)
       KillHeroUnlessProtected(x, y+1);
       return;
     }
-    else if (smashed == EL_PINGUIN)
+    else if (smashed == EL_PENGUIN)
     {
       Bang(x, y+1);
       return;
     }
-    else if (element == EL_EDELSTEIN_BD)
+    else if (element == EL_BD_DIAMOND)
     {
       if (IS_ENEMY(smashed) && IS_BD_ELEMENT(smashed))
       {
@@ -2141,8 +2141,8 @@ void Impact(int x, int y)
       if (IS_ENEMY(smashed) ||
          smashed == EL_BOMB || smashed == EL_SP_DISK_ORANGE ||
          smashed == EL_DX_SUPABOMB ||
-         smashed == EL_SONDE || smashed == EL_SCHWEIN ||
-         smashed == EL_DRACHE || smashed == EL_MOLE)
+         smashed == EL_SATELLITE || smashed == EL_PIG ||
+         smashed == EL_DRAGON || smashed == EL_MOLE)
       {
        Bang(x, y+1);
        return;
@@ -2177,13 +2177,13 @@ void Impact(int x, int y)
        {
          ToggleBeltSwitch(x, y+1);
        }
-       else if (smashed == EL_SWITCHGATE_SWITCH_1 ||
-                smashed == EL_SWITCHGATE_SWITCH_2)
+       else if (smashed == EL_SWITCHGATE_SWITCH_UP ||
+                smashed == EL_SWITCHGATE_SWITCH_DOWN)
        {
          ToggleSwitchgateSwitch(x, y+1);
        }
-       else if (smashed == EL_LIGHT_SWITCH_OFF ||
-                smashed == EL_LIGHT_SWITCH_ON)
+       else if (smashed == EL_LIGHT_SWITCH ||
+                smashed == EL_LIGHT_SWITCH_ACTIVE)
        {
          ToggleLightSwitch(x, y+1);
        }
@@ -2360,7 +2360,7 @@ void TurnRound(int x, int y)
 
     MovDelay[x][y] = 6+RND(40);
   }
-  else if (element == EL_SCHWEIN)
+  else if (element == EL_PIG)
   {
     boolean can_turn_left = FALSE, can_turn_right = FALSE, can_move_on = FALSE;
     boolean should_turn_left = FALSE, should_turn_right = FALSE;
@@ -2432,7 +2432,7 @@ void TurnRound(int x, int y)
 
     MovDelay[x][y] = 0;
   }
-  else if (element == EL_DRACHE)
+  else if (element == EL_DRAGON)
   {
     boolean can_turn_left = FALSE, can_turn_right = FALSE, can_move_on = FALSE;
     int rnd_value = 24;
@@ -2505,7 +2505,7 @@ void TurnRound(int x, int y)
     }
     MovDelay[x][y] = 0;
   }
-  else if (element == EL_ROBOT || element == EL_SONDE || element == EL_PINGUIN)
+  else if (element == EL_ROBOT || element == EL_SATELLITE || element == EL_PENGUIN)
   {
     int attr_x = -1, attr_y = -1;
 
@@ -2540,7 +2540,7 @@ void TurnRound(int x, int y)
       attr_y = ZY;
     }
 
-    if (element == EL_PINGUIN)
+    if (element == EL_PENGUIN)
     {
       int i;
       static int xy[4][2] =
@@ -2606,7 +2606,7 @@ void TurnRound(int x, int y)
        if (IN_LEV_FIELD(newx, newy) &&
            (IS_FREE(newx, newy) ||
             Feld[newx][newy] == EL_ACID ||
-            (element == EL_PINGUIN &&
+            (element == EL_PENGUIN &&
              (Feld[newx][newy] == EL_EXIT_OPEN ||
               IS_MAMPF3(Feld[newx][newy])))))
          return;
@@ -2618,7 +2618,7 @@ void TurnRound(int x, int y)
        if (IN_LEV_FIELD(newx, newy) &&
            (IS_FREE(newx, newy) ||
             Feld[newx][newy] == EL_ACID ||
-            (element == EL_PINGUIN &&
+            (element == EL_PENGUIN &&
              (Feld[newx][newy] == EL_EXIT_OPEN ||
               IS_MAMPF3(Feld[newx][newy])))))
          return;
@@ -2809,7 +2809,7 @@ void StartMoving(int x, int y)
       {
        if (left && right &&
            (game.emulation != EMU_BOULDERDASH &&
-            element != EL_BD_ROCK && element != EL_EDELSTEIN_BD))
+            element != EL_BD_ROCK && element != EL_BD_DIAMOND))
          left = !(right = RND(2));
 
        InitMovingField(x, y, left ? MV_LEFT : MV_RIGHT);
@@ -2831,7 +2831,7 @@ void StartMoving(int x, int y)
   {
     int newx, newy;
 
-    if ((element == EL_SONDE || element == EL_BALLOON ||
+    if ((element == EL_SATELLITE || element == EL_BALLOON ||
         element == EL_SPRING_MOVING)
        && JustBeingPushed(x, y))
       return;
@@ -2884,7 +2884,7 @@ void StartMoving(int x, int y)
       }
       else if (element == EL_SP_ELECTRON)
        DrawGraphicAnimation(x, y, GFX2_SP_ELECTRON, 8, 2, ANIM_NORMAL);
-      else if (element == EL_DRACHE)
+      else if (element == EL_DRAGON)
       {
        int i;
        int dir = MovDir[x][y];
@@ -2954,15 +2954,15 @@ void StartMoving(int x, int y)
 #endif
 
     }
-    else if ((element == EL_PINGUIN || element == EL_ROBOT ||
-             element == EL_SONDE || element == EL_BALLOON) &&
+    else if ((element == EL_PENGUIN || element == EL_ROBOT ||
+             element == EL_SATELLITE || element == EL_BALLOON) &&
             IN_LEV_FIELD(newx, newy) &&
             MovDir[x][y] == MV_DOWN && Feld[newx][newy] == EL_ACID)
     {
       Blurb(x, y);
       Store[x][y] = EL_ACID;
     }
-    else if (element == EL_PINGUIN && IN_LEV_FIELD(newx, newy))
+    else if (element == EL_PENGUIN && IN_LEV_FIELD(newx, newy))
     {
       if (Feld[newx][newy] == EL_EXIT_OPEN)
       {
@@ -2996,7 +2996,7 @@ void StartMoving(int x, int y)
        return;
       }
     }
-    else if (element == EL_SCHWEIN && IN_LEV_FIELD(newx, newy))
+    else if (element == EL_PIG && IN_LEV_FIELD(newx, newy))
     {
       if (IS_GEM(Feld[newx][newy]))
       {
@@ -3019,7 +3019,7 @@ void StartMoving(int x, int y)
        return;
       }
     }
-    else if (element == EL_DRACHE && IN_LEV_FIELD(newx, newy))
+    else if (element == EL_DRAGON && IN_LEV_FIELD(newx, newy))
     {
       if (!IS_FREE(newx, newy))
       {
@@ -3041,7 +3041,7 @@ void StartMoving(int x, int y)
                        MovingOrBlocked2Element(newx2, newy2) : EL_STEELWALL);
 
        if ((wanna_flame || IS_ENEMY(element1) || IS_ENEMY(element2)) &&
-           element1 != EL_DRACHE && element2 != EL_DRACHE &&
+           element1 != EL_DRAGON && element2 != EL_DRAGON &&
            element1 != EL_BURNING && element2 != EL_BURNING)
        {
          if (IS_PLAYER(x, y))
@@ -3153,7 +3153,7 @@ void StartMoving(int x, int y)
 #else
        DrawNewGraphicAnimation(x, y, el2img(element));
 #endif
-      else if (element == EL_SONDE)
+      else if (element == EL_SATELLITE)
 #if 0
        DrawGraphicAnimation(x, y, GFX_SONDE_START, 8, 2, ANIM_NORMAL);
 #else
@@ -3324,7 +3324,7 @@ void ContinueMoving(int x, int y)
       TestIfBadThingTouchesFriend(newx, newy);
       TestIfBadThingTouchesOtherBadThing(newx, newy);
     }
-    else if (element == EL_PINGUIN)
+    else if (element == EL_PENGUIN)
       TestIfFriendTouchesBadThing(newx, newy);
 
     if (CAN_SMASH(element) && direction == MV_DOWN &&
@@ -3444,7 +3444,7 @@ void AmoebeUmwandeln(int ax, int ay)
        if (Feld[x][y] == EL_AMOEBA_DEAD && AmoebaNr[x][y] == group_nr)
        {
          AmoebaNr[x][y] = 0;
-         Feld[x][y] = EL_AMOEBA2DIAM;
+         Feld[x][y] = EL_AMOEBA_TO_DIAMOND;
        }
       }
     }
@@ -3471,7 +3471,7 @@ void AmoebeUmwandeln(int ax, int ay)
       if (!IN_LEV_FIELD(x, y))
        continue;
 
-      if (Feld[x][y] == EL_AMOEBA2DIAM)
+      if (Feld[x][y] == EL_AMOEBA_TO_DIAMOND)
       {
        PlaySoundLevel(x, y, (IS_GEM(level.amoeba_content) ?
                              SND_AMOEBA_TURNING_TO_GEM :
@@ -4073,7 +4073,7 @@ void EdelsteinFunkeln(int x, int y)
   if (!IN_SCR_FIELD(SCREENX(x), SCREENY(y)) || IS_MOVING(x, y))
     return;
 
-  if (Feld[x][y] == EL_EDELSTEIN_BD)
+  if (Feld[x][y] == EL_BD_DIAMOND)
     DrawGraphicAnimation(x, y, GFX_EDELSTEIN_BD, 4, 4, ANIM_REVERSE);
   else
   {
@@ -4193,7 +4193,7 @@ void MauerAbleger(int ax, int ay)
   if (IN_LEV_FIELD(ax+1, ay) && IS_FREE(ax+1, ay))
     rechts_frei = TRUE;
 
-  if (element == EL_MAUER_Y || element == EL_MAUER_XY)
+  if (element == EL_WALL_GROWING_Y || element == EL_WALL_GROWING_XY)
   {
     if (oben_frei)
     {
@@ -4215,8 +4215,8 @@ void MauerAbleger(int ax, int ay)
     }
   }
 
-  if (element == EL_MAUER_X || element == EL_MAUER_XY ||
-      element == EL_MAUER_LEBT)
+  if (element == EL_WALL_GROWING_X || element == EL_WALL_GROWING_XY ||
+      element == EL_WALL_GROWING)
   {
     if (links_frei)
     {
@@ -4239,7 +4239,7 @@ void MauerAbleger(int ax, int ay)
     }
   }
 
-  if (element == EL_MAUER_LEBT && (links_frei || rechts_frei))
+  if (element == EL_WALL_GROWING && (links_frei || rechts_frei))
     DrawLevelField(ax, ay);
 
   if (!IN_LEV_FIELD(ax, ay-1) || IS_MAUER(Feld[ax][ay-1]))
@@ -4252,9 +4252,9 @@ void MauerAbleger(int ax, int ay)
     rechts_massiv = TRUE;
 
   if (((oben_massiv && unten_massiv) ||
-       element == EL_MAUER_X || element == EL_MAUER_LEBT) &&
+       element == EL_WALL_GROWING_X || element == EL_WALL_GROWING) &&
       ((links_massiv && rechts_massiv) ||
-       element == EL_MAUER_Y))
+       element == EL_WALL_GROWING_Y))
     Feld[ax][ay] = EL_WALL;
 
   if (new_wall)
@@ -4280,9 +4280,9 @@ void CheckForDragon(int x, int y)
       int xx = x + j*xy[i][0], yy = y + j*xy[i][1];
 
       if (IN_LEV_FIELD(xx, yy) &&
-         (Feld[xx][yy] == EL_BURNING || Feld[xx][yy] == EL_DRACHE))
+         (Feld[xx][yy] == EL_BURNING || Feld[xx][yy] == EL_DRAGON))
       {
-       if (Feld[xx][yy] == EL_DRACHE)
+       if (Feld[xx][yy] == EL_DRAGON)
          dragon_found = TRUE;
       }
       else
@@ -4571,7 +4571,7 @@ static void PlayerActions(struct PlayerInfo *player, byte player_action)
       if (IN_LEV_FIELD(jx+dx, jy) && IS_PUSHABLE(Feld[jx+dx][jy]))
       {
        int el = Feld[jx+dx][jy];
-       int push_delay = (IS_SB_ELEMENT(el) || el == EL_SONDE ? 2 :
+       int push_delay = (IS_SB_ELEMENT(el) || el == EL_SATELLITE ? 2 :
                          (el == EL_BALLOON || el == EL_SPRING) ? 0 : 10);
 
        if (tape.delay_played + push_delay >= tape.pos[tape.counter].delay)
@@ -4777,10 +4777,10 @@ void GameActions()
       AusgangstuerBlinken(x, y);
     else if (element == EL_MAUERND)
       MauerWaechst(x, y);
-    else if (element == EL_MAUER_LEBT ||
-            element == EL_MAUER_X ||
-            element == EL_MAUER_Y ||
-            element == EL_MAUER_XY)
+    else if (element == EL_WALL_GROWING ||
+            element == EL_WALL_GROWING_X ||
+            element == EL_WALL_GROWING_Y ||
+            element == EL_WALL_GROWING_XY)
       MauerAbleger(x, y);
     else if (element == EL_BURNING)
       CheckForDragon(x, y);
@@ -4810,7 +4810,7 @@ void GameActions()
       CloseTimegate(x, y);
     else if (element == EL_EXTRA_TIME)
       DrawGraphicAnimation(x, y, GFX_EXTRA_TIME, 6, 4, ANIM_NORMAL);
-    else if (element == EL_SHIELD_PASSIVE)
+    else if (element == EL_SHIELD_NORMAL)
     {
       DrawGraphicAnimation(x, y, GFX_SHIELD_PASSIVE, 6, 4, ANIM_NORMAL);
 #if 0
@@ -4967,12 +4967,12 @@ void GameActions()
       {
        element = Feld[x][y];
 
-       if (element == EL_LIGHT_SWITCH_ON)
+       if (element == EL_LIGHT_SWITCH_ACTIVE)
        {
-         Feld[x][y] = EL_LIGHT_SWITCH_OFF;
+         Feld[x][y] = EL_LIGHT_SWITCH;
          DrawLevelField(x, y);
        }
-       else if (element == EL_INVISIBLE_STEEL ||
+       else if (element == EL_INVISIBLE_STEELWALL ||
                 element == EL_INVISIBLE_WALL ||
                 element == EL_SAND_INVISIBLE)
          DrawLevelField(x, y);
@@ -5596,7 +5596,7 @@ void TestIfBadThingHitsGoodThing(int bad_x, int bad_y, int bad_move_dir)
        kill_y = test_y;
        break;
       }
-      else if (test_element == EL_PINGUIN)
+      else if (test_element == EL_PENGUIN)
       {
        kill_x = test_x;
        kill_y = test_y;
@@ -5832,10 +5832,10 @@ int DigField(struct PlayerInfo *player,
       break;
 
     case EL_EMERALD:
-    case EL_EDELSTEIN_BD:
-    case EL_EDELSTEIN_YELLOW:
-    case EL_EDELSTEIN_RED:
-    case EL_EDELSTEIN_PURPLE:
+    case EL_BD_DIAMOND:
+    case EL_EMERALD_YELLOW:
+    case EL_EMERALD_RED:
+    case EL_EMERALD_PURPLE:
     case EL_DIAMOND:
     case EL_SP_INFOTRON:
     case EL_PEARL:
@@ -5874,7 +5874,7 @@ int DigField(struct PlayerInfo *player,
       PlaySoundStereo(SND_EXTRA_TIME_COLLECTING, SOUND_MAX_RIGHT);
       break;
 
-    case EL_SHIELD_PASSIVE:
+    case EL_SHIELD_NORMAL:
       RemoveField(x, y);
       player->shield_passive_time_left += 10;
       PlaySoundLevel(x, y, SND_SHIELD_NORMAL_COLLECTING);
@@ -5938,12 +5938,12 @@ int DigField(struct PlayerInfo *player,
       break;
     }
 
-    case EL_EM_KEY_1:
-    case EL_EM_KEY_2:
-    case EL_EM_KEY_3:
-    case EL_EM_KEY_4:
+    case EL_EM_KEY1:
+    case EL_EM_KEY2:
+    case EL_EM_KEY3:
+    case EL_EM_KEY4:
     {
-      int key_nr = element - EL_EM_KEY_1;
+      int key_nr = element - EL_EM_KEY1;
 
       RemoveField(x, y);
       player->key[key_nr] = TRUE;
@@ -5986,18 +5986,18 @@ int DigField(struct PlayerInfo *player,
       }
       break;
 
-    case EL_BELT1_SWITCH_LEFT:
-    case EL_BELT1_SWITCH_MIDDLE:
-    case EL_BELT1_SWITCH_RIGHT:
-    case EL_BELT2_SWITCH_LEFT:
-    case EL_BELT2_SWITCH_MIDDLE:
-    case EL_BELT2_SWITCH_RIGHT:
-    case EL_BELT3_SWITCH_LEFT:
-    case EL_BELT3_SWITCH_MIDDLE:
-    case EL_BELT3_SWITCH_RIGHT:
-    case EL_BELT4_SWITCH_LEFT:
-    case EL_BELT4_SWITCH_MIDDLE:
-    case EL_BELT4_SWITCH_RIGHT:
+    case EL_CONVEYOR_BELT1_SWITCH_LEFT:
+    case EL_CONVEYOR_BELT1_SWITCH_MIDDLE:
+    case EL_CONVEYOR_BELT1_SWITCH_RIGHT:
+    case EL_CONVEYOR_BELT2_SWITCH_LEFT:
+    case EL_CONVEYOR_BELT2_SWITCH_MIDDLE:
+    case EL_CONVEYOR_BELT2_SWITCH_RIGHT:
+    case EL_CONVEYOR_BELT3_SWITCH_LEFT:
+    case EL_CONVEYOR_BELT3_SWITCH_MIDDLE:
+    case EL_CONVEYOR_BELT3_SWITCH_RIGHT:
+    case EL_CONVEYOR_BELT4_SWITCH_LEFT:
+    case EL_CONVEYOR_BELT4_SWITCH_MIDDLE:
+    case EL_CONVEYOR_BELT4_SWITCH_RIGHT:
       if (!player->Switching)
       {
        player->Switching = TRUE;
@@ -6007,8 +6007,8 @@ int DigField(struct PlayerInfo *player,
       return MF_ACTION;
       break;
 
-    case EL_SWITCHGATE_SWITCH_1:
-    case EL_SWITCHGATE_SWITCH_2:
+    case EL_SWITCHGATE_SWITCH_UP:
+    case EL_SWITCHGATE_SWITCH_DOWN:
       if (!player->Switching)
       {
        player->Switching = TRUE;
@@ -6018,13 +6018,13 @@ int DigField(struct PlayerInfo *player,
       return MF_ACTION;
       break;
 
-    case EL_LIGHT_SWITCH_OFF:
-    case EL_LIGHT_SWITCH_ON:
+    case EL_LIGHT_SWITCH:
+    case EL_LIGHT_SWITCH_ACTIVE:
       if (!player->Switching)
       {
        player->Switching = TRUE;
        ToggleLightSwitch(x, y);
-       PlaySoundLevel(x, y, element == EL_LIGHT_SWITCH_OFF ?
+       PlaySoundLevel(x, y, element == EL_LIGHT_SWITCH ?
                       SND_LIGHT_SWITCH_ACTIVATING :
                       SND_LIGHT_SWITCH_DEACTIVATING);
       }
@@ -6056,7 +6056,7 @@ int DigField(struct PlayerInfo *player,
       return MF_ACTION;
       break;
 
-    case EL_SP_EXIT:
+    case EL_SP_EXIT_CLOSED:
       if (local_player->gems_still_needed > 0)
        return MF_NO_ACTION;
 
@@ -6144,11 +6144,11 @@ int DigField(struct PlayerInfo *player,
        return MF_NO_ACTION;
       break;
 
-    case EL_EM_GATE_1:
-    case EL_EM_GATE_2:
-    case EL_EM_GATE_3:
-    case EL_EM_GATE_4:
-      if (!player->key[element - EL_EM_GATE_1])
+    case EL_EM_GATE1:
+    case EL_EM_GATE2:
+    case EL_EM_GATE3:
+    case EL_EM_GATE4:
+      if (!player->key[element - EL_EM_GATE1])
        return MF_NO_ACTION;
       if (!IN_LEV_FIELD(x + dx, y + dy) || !IS_FREE(x + dx, y + dy))
        return MF_NO_ACTION;
@@ -6309,7 +6309,7 @@ int DigField(struct PlayerInfo *player,
 
     case EL_SOKOBAN_OBJEKT:
     case EL_SOKOBAN_FELD_VOLL:
-    case EL_SONDE:
+    case EL_SATELLITE:
     case EL_SP_DISK_YELLOW:
     case EL_BALLOON:
       if (mode == DF_SNAP)
@@ -6397,9 +6397,9 @@ int DigField(struct PlayerInfo *player,
 
       break;
 
-    case EL_PINGUIN:
-    case EL_SCHWEIN:
-    case EL_DRACHE:
+    case EL_PENGUIN:
+    case EL_PIG:
+    case EL_DRAGON:
       break;
 
     default:
@@ -6485,7 +6485,7 @@ boolean PlaceBomb(struct PlayerInfo *player)
   }
   else
   {
-    Feld[jx][jy] = EL_DYNABOMB_ACTIVE_1 + (player->element_nr - EL_SPIELER1);
+    Feld[jx][jy] = EL_DYNABOMB_ACTIVE_1 + (player->element_nr - EL_PLAYER1);
     MovDelay[jx][jy] = 96;
     player->dynabombs_left--;
     if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy)))
@@ -6569,10 +6569,10 @@ void RaiseScoreElement(int element)
   switch(element)
   {
     case EL_EMERALD:
-    case EL_EDELSTEIN_BD:
-    case EL_EDELSTEIN_YELLOW:
-    case EL_EDELSTEIN_RED:
-    case EL_EDELSTEIN_PURPLE:
+    case EL_BD_DIAMOND:
+    case EL_EMERALD_YELLOW:
+    case EL_EMERALD_RED:
+    case EL_EMERALD_PURPLE:
       RaiseScore(level.score[SC_EDELSTEIN]);
       break;
     case EL_DIAMOND:
index 8c391363250de573fbed086afb9b39ed25c448a5..5a643afb69d8a11befd2b3a5bbfce4b54a218b2e 100644 (file)
@@ -576,10 +576,10 @@ void InitElementInfo()
     { EL_AUSGANG_ACT,                  GFX_AUSGANG_ACT         },
     { EL_EXIT_OPEN,                    GFX_AUSGANG_AUF         },
     { EL_PLAYER,                       GFX_SPIELFIGUR          },
-    { EL_SPIELER1,                     GFX_SPIELER1            },
-    { EL_SPIELER2,                     GFX_SPIELER2            },
-    { EL_SPIELER3,                     GFX_SPIELER3            },
-    { EL_SPIELER4,                     GFX_SPIELER4            },
+    { EL_PLAYER1,                      GFX_SPIELER1            },
+    { EL_PLAYER2,                      GFX_SPIELER2            },
+    { EL_PLAYER3,                      GFX_SPIELER3            },
+    { EL_PLAYER4,                      GFX_SPIELER4            },
     { EL_BUG,                          GFX_KAEFER              },
     { EL_BUG_RIGHT,                    GFX_KAEFER_RIGHT        },
     { EL_BUG_UP,                       GFX_KAEFER_UP           },
@@ -620,13 +620,13 @@ void InitElementInfo()
     { EL_AMOEBA_DRY,                   GFX_AMOEBE_NORM         },
     { EL_AMOEBA_FULL,                  GFX_AMOEBE_VOLL         },
     { EL_BD_AMOEBA,                    GFX_AMOEBE_BD           },
-    { EL_AMOEBA2DIAM,                  GFX_AMOEBA2DIAM         },
+    { EL_AMOEBA_TO_DIAMOND,            GFX_AMOEBA2DIAM         },
     { EL_AMOEBA_DRIPPING,              GFX_AMOEBE_NASS         },
     { EL_NUT,                          GFX_KOKOSNUSS           },
     { EL_GAMEOFLIFE,                   GFX_LIFE                },
     { EL_BIOMAZE,                      GFX_LIFE_ASYNC          },
     { EL_DYNAMITE_ACTIVE,              GFX_DYNAMIT             },
-    { EL_BADEWANNE,                    GFX_BADEWANNE           },
+    { EL_STONEBLOCK,                   GFX_BADEWANNE           },
     { EL_ACIDPOOL_TOPLEFT,             GFX_BADEWANNE1          },
     { EL_ACIDPOOL_TOPRIGHT,            GFX_BADEWANNE2          },
     { EL_ACIDPOOL_BOTTOMLEFT,          GFX_BADEWANNE3          },
@@ -646,31 +646,31 @@ void InitElementInfo()
     { EL_GATE2_GRAY,                   GFX_PFORTE2X            },
     { EL_GATE3_GRAY,                   GFX_PFORTE3X            },
     { EL_GATE4_GRAY,                   GFX_PFORTE4X            },
-    { EL_DYNAMITE,             GFX_DYNAMIT_AUS         },
+    { EL_DYNAMITE,                     GFX_DYNAMIT_AUS         },
     { EL_PACMAN,                       GFX_PACMAN              },
     { EL_PACMAN_RIGHT,                 GFX_PACMAN_RIGHT        },
     { EL_PACMAN_UP,                    GFX_PACMAN_UP           },
     { EL_PACMAN_LEFT,                  GFX_PACMAN_LEFT         },
     { EL_PACMAN_DOWN,                  GFX_PACMAN_DOWN         },
-    { EL_INVISIBLE_WALL,                       GFX_UNSICHTBAR          },
+    { EL_INVISIBLE_WALL,               GFX_UNSICHTBAR          },
     { EL_WALL_EMERALD,                 GFX_ERZ_EDEL            },
     { EL_WALL_DIAMOND,                 GFX_ERZ_DIAM            },
-    { EL_LAMP,                 GFX_BIRNE_AUS           },
+    { EL_LAMP,                         GFX_BIRNE_AUS           },
     { EL_LAMP_ACTIVE,                  GFX_BIRNE_EIN           },
     { EL_TIME_ORB_FULL,                        GFX_ZEIT_VOLL           },
-    { EL_TIME_ORB_EMPTY,                       GFX_ZEIT_LEER           },
-    { EL_MAUER_LEBT,                   GFX_MAUER_LEBT          },
-    { EL_MAUER_X,                      GFX_MAUER_X             },
-    { EL_MAUER_Y,                      GFX_MAUER_Y             },
-    { EL_MAUER_XY,                     GFX_MAUER_XY            },
-    { EL_EDELSTEIN_BD,                 GFX_EDELSTEIN_BD        },
-    { EL_EDELSTEIN_YELLOW,             GFX_EDELSTEIN_GELB      },
-    { EL_EDELSTEIN_RED,                        GFX_EDELSTEIN_ROT       },
-    { EL_EDELSTEIN_PURPLE,             GFX_EDELSTEIN_LILA      },
-    { EL_WALL_BD_DIAMOND,                      GFX_ERZ_EDEL_BD         },
-    { EL_WALL_EMERALD_YELLOW,                  GFX_ERZ_EDEL_GELB       },
-    { EL_WALL_EMERALD_RED,                     GFX_ERZ_EDEL_ROT        },
-    { EL_WALL_EMERALD_PURPLE,                  GFX_ERZ_EDEL_LILA       },
+    { EL_TIME_ORB_EMPTY,               GFX_ZEIT_LEER           },
+    { EL_WALL_GROWING,                 GFX_MAUER_LEBT          },
+    { EL_WALL_GROWING_X,               GFX_MAUER_X             },
+    { EL_WALL_GROWING_Y,               GFX_MAUER_Y             },
+    { EL_WALL_GROWING_XY,              GFX_MAUER_XY            },
+    { EL_BD_DIAMOND,                   GFX_EDELSTEIN_BD        },
+    { EL_EMERALD_YELLOW,               GFX_EDELSTEIN_GELB      },
+    { EL_EMERALD_RED,                  GFX_EDELSTEIN_ROT       },
+    { EL_EMERALD_PURPLE,               GFX_EDELSTEIN_LILA      },
+    { EL_WALL_BD_DIAMOND,              GFX_ERZ_EDEL_BD         },
+    { EL_WALL_EMERALD_YELLOW,          GFX_ERZ_EDEL_GELB       },
+    { EL_WALL_EMERALD_RED,             GFX_ERZ_EDEL_ROT        },
+    { EL_WALL_EMERALD_PURPLE,          GFX_ERZ_EDEL_LILA       },
     { EL_DARK_YAMYAM,                  GFX_MAMPFER2            },
     { EL_MAGIC_WALL_BD_OFF,            GFX_MAGIC_WALL_BD_OFF   },
     { EL_MAGIC_WALL_BD_EMPTY,          GFX_MAGIC_WALL_BD_EMPTY },
@@ -688,36 +688,36 @@ void InitElementInfo()
     { EL_SOKOBAN_FELD_LEER,            GFX_SOKOBAN_FELD_LEER   },
     { EL_SOKOBAN_FELD_VOLL,            GFX_SOKOBAN_FELD_VOLL   },
     { EL_MOLE,                         GFX_MOLE                },
-    { EL_PINGUIN,                      GFX_PINGUIN             },
-    { EL_SCHWEIN,                      GFX_SCHWEIN             },
-    { EL_DRACHE,                       GFX_DRACHE              },
-    { EL_SONDE,                                GFX_SONDE               },
-    { EL_PFEIL_LEFT,                   GFX_PFEIL_LEFT          },
-    { EL_PFEIL_RIGHT,                  GFX_PFEIL_RIGHT         },
-    { EL_PFEIL_UP,                     GFX_PFEIL_UP            },
-    { EL_PFEIL_DOWN,                   GFX_PFEIL_DOWN          },
+    { EL_PENGUIN,                      GFX_PINGUIN             },
+    { EL_PIG,                          GFX_SCHWEIN             },
+    { EL_DRAGON,                       GFX_DRACHE              },
+    { EL_SATELLITE,                    GFX_SONDE               },
+    { EL_ARROW_LEFT,                   GFX_PFEIL_LEFT          },
+    { EL_ARROW_RIGHT,                  GFX_PFEIL_RIGHT         },
+    { EL_ARROW_UP,                     GFX_PFEIL_UP            },
+    { EL_ARROW_DOWN,                   GFX_PFEIL_DOWN          },
     { EL_SPEED_PILL,                   GFX_SPEED_PILL          },
     { EL_SP_TERMINAL_ACTIVE,           GFX_SP_TERMINAL         },
     { EL_SP_BUG_ACTIVE,                        GFX_SP_BUG_ACTIVE       },
     { EL_SP_ZONK,                      GFX_SP_ZONK             },
-    { EL_INVISIBLE_STEEL,              GFX_INVISIBLE_STEEL     },
+    { EL_INVISIBLE_STEELWALL,          GFX_INVISIBLE_STEEL     },
     { EL_BLACK_ORB,                    GFX_BLACK_ORB           },
-    { EL_EM_GATE_1,                    GFX_EM_GATE_1           },
-    { EL_EM_GATE_2,                    GFX_EM_GATE_2           },
-    { EL_EM_GATE_3,                    GFX_EM_GATE_3           },
-    { EL_EM_GATE_4,                    GFX_EM_GATE_4           },
+    { EL_EM_GATE1,                     GFX_EM_GATE_1           },
+    { EL_EM_GATE2,                     GFX_EM_GATE_2           },
+    { EL_EM_GATE3,                     GFX_EM_GATE_3           },
+    { EL_EM_GATE4,                     GFX_EM_GATE_4           },
     { EL_EM_GATE1_GRAY,                        GFX_EM_GATE_1X          },
     { EL_EM_GATE2_GRAY,                        GFX_EM_GATE_2X          },
     { EL_EM_GATE3_GRAY,                        GFX_EM_GATE_3X          },
     { EL_EM_GATE4_GRAY,                        GFX_EM_GATE_4X          },
-    { EL_EM_KEY_1_FILE,                        GFX_EM_KEY_1            },
-    { EL_EM_KEY_2_FILE,                        GFX_EM_KEY_2            },
-    { EL_EM_KEY_3_FILE,                        GFX_EM_KEY_3            },
-    { EL_EM_KEY_4_FILE,                        GFX_EM_KEY_4            },
-    { EL_EM_KEY_1,                     GFX_EM_KEY_1            },
-    { EL_EM_KEY_2,                     GFX_EM_KEY_2            },
-    { EL_EM_KEY_3,                     GFX_EM_KEY_3            },
-    { EL_EM_KEY_4,                     GFX_EM_KEY_4            },
+    { EL_EM_KEY1_FILE,                 GFX_EM_KEY_1            },
+    { EL_EM_KEY2_FILE,                 GFX_EM_KEY_2            },
+    { EL_EM_KEY3_FILE,                 GFX_EM_KEY_3            },
+    { EL_EM_KEY4_FILE,                 GFX_EM_KEY_4            },
+    { EL_EM_KEY1,                      GFX_EM_KEY_1            },
+    { EL_EM_KEY2,                      GFX_EM_KEY_2            },
+    { EL_EM_KEY3,                      GFX_EM_KEY_3            },
+    { EL_EM_KEY4,                      GFX_EM_KEY_4            },
     { EL_PEARL,                                GFX_PEARL               },
     { EL_CRYSTAL,                      GFX_CRYSTAL             },
     { EL_WALL_PEARL,                   GFX_WALL_PEARL          },
@@ -725,41 +725,41 @@ void InitElementInfo()
     { EL_DOOR_WHITE,                   GFX_DOOR_WHITE          },
     { EL_DOOR_WHITE_GRAY,              GFX_DOOR_WHITE_GRAY     },
     { EL_KEY_WHITE,                    GFX_KEY_WHITE           },
-    { EL_SHIELD_PASSIVE,               GFX_SHIELD_PASSIVE      },
+    { EL_SHIELD_NORMAL,                        GFX_SHIELD_PASSIVE      },
     { EL_SHIELD_ACTIVE,                        GFX_SHIELD_ACTIVE       },
     { EL_EXTRA_TIME,                   GFX_EXTRA_TIME          },
     { EL_SWITCHGATE_OPEN,              GFX_SWITCHGATE_OPEN     },
     { EL_SWITCHGATE_CLOSED,            GFX_SWITCHGATE_CLOSED   },
-    { EL_SWITCHGATE_SWITCH_1,          GFX_SWITCHGATE_SWITCH_1 },
-    { EL_SWITCHGATE_SWITCH_2,          GFX_SWITCHGATE_SWITCH_2 },
-    { EL_BELT1_LEFT,                   GFX_BELT1_LEFT          },
-    { EL_BELT1_MIDDLE,                 GFX_BELT1_MIDDLE        },
-    { EL_BELT1_RIGHT,                  GFX_BELT1_RIGHT         },
-    { EL_BELT1_SWITCH_LEFT,            GFX_BELT1_SWITCH_LEFT   },
-    { EL_BELT1_SWITCH_MIDDLE,          GFX_BELT1_SWITCH_MIDDLE },
-    { EL_BELT1_SWITCH_RIGHT,           GFX_BELT1_SWITCH_RIGHT  },
-    { EL_BELT2_LEFT,                   GFX_BELT2_LEFT          },
-    { EL_BELT2_MIDDLE,                 GFX_BELT2_MIDDLE        },
-    { EL_BELT2_RIGHT,                  GFX_BELT2_RIGHT         },
-    { EL_BELT2_SWITCH_LEFT,            GFX_BELT2_SWITCH_LEFT   },
-    { EL_BELT2_SWITCH_MIDDLE,          GFX_BELT2_SWITCH_MIDDLE },
-    { EL_BELT2_SWITCH_RIGHT,           GFX_BELT2_SWITCH_RIGHT  },
-    { EL_BELT3_LEFT,                   GFX_BELT3_LEFT          },
-    { EL_BELT3_MIDDLE,                 GFX_BELT3_MIDDLE        },
-    { EL_BELT3_RIGHT,                  GFX_BELT3_RIGHT         },
-    { EL_BELT3_SWITCH_LEFT,            GFX_BELT3_SWITCH_LEFT   },
-    { EL_BELT3_SWITCH_MIDDLE,          GFX_BELT3_SWITCH_MIDDLE },
-    { EL_BELT3_SWITCH_RIGHT,           GFX_BELT3_SWITCH_RIGHT  },
-    { EL_BELT4_LEFT,                   GFX_BELT4_LEFT          },
-    { EL_BELT4_MIDDLE,                 GFX_BELT4_MIDDLE        },
-    { EL_BELT4_RIGHT,                  GFX_BELT4_RIGHT         },
-    { EL_BELT4_SWITCH_LEFT,            GFX_BELT4_SWITCH_LEFT   },
-    { EL_BELT4_SWITCH_MIDDLE,          GFX_BELT4_SWITCH_MIDDLE },
-    { EL_BELT4_SWITCH_RIGHT,           GFX_BELT4_SWITCH_RIGHT  },
+    { EL_SWITCHGATE_SWITCH_UP,         GFX_SWITCHGATE_SWITCH_1 },
+    { EL_SWITCHGATE_SWITCH_DOWN,       GFX_SWITCHGATE_SWITCH_2 },
+    { EL_CONVEYOR_BELT1_LEFT,          GFX_BELT1_LEFT          },
+    { EL_CONVEYOR_BELT1_MIDDLE,                GFX_BELT1_MIDDLE        },
+    { EL_CONVEYOR_BELT1_RIGHT,         GFX_BELT1_RIGHT         },
+    { EL_CONVEYOR_BELT1_SWITCH_LEFT,   GFX_BELT1_SWITCH_LEFT   },
+    { EL_CONVEYOR_BELT1_SWITCH_MIDDLE, GFX_BELT1_SWITCH_MIDDLE },
+    { EL_CONVEYOR_BELT1_SWITCH_RIGHT,  GFX_BELT1_SWITCH_RIGHT  },
+    { EL_CONVEYOR_BELT2_LEFT,          GFX_BELT2_LEFT          },
+    { EL_CONVEYOR_BELT2_MIDDLE,                GFX_BELT2_MIDDLE        },
+    { EL_CONVEYOR_BELT2_RIGHT,         GFX_BELT2_RIGHT         },
+    { EL_CONVEYOR_BELT2_SWITCH_LEFT,   GFX_BELT2_SWITCH_LEFT   },
+    { EL_CONVEYOR_BELT2_SWITCH_MIDDLE, GFX_BELT2_SWITCH_MIDDLE },
+    { EL_CONVEYOR_BELT2_SWITCH_RIGHT,  GFX_BELT2_SWITCH_RIGHT  },
+    { EL_CONVEYOR_BELT3_LEFT,          GFX_BELT3_LEFT          },
+    { EL_CONVEYOR_BELT3_MIDDLE,                GFX_BELT3_MIDDLE        },
+    { EL_CONVEYOR_BELT3_RIGHT,         GFX_BELT3_RIGHT         },
+    { EL_CONVEYOR_BELT3_SWITCH_LEFT,   GFX_BELT3_SWITCH_LEFT   },
+    { EL_CONVEYOR_BELT3_SWITCH_MIDDLE, GFX_BELT3_SWITCH_MIDDLE },
+    { EL_CONVEYOR_BELT3_SWITCH_RIGHT,  GFX_BELT3_SWITCH_RIGHT  },
+    { EL_CONVEYOR_BELT4_LEFT,          GFX_BELT4_LEFT          },
+    { EL_CONVEYOR_BELT4_MIDDLE,                GFX_BELT4_MIDDLE        },
+    { EL_CONVEYOR_BELT4_RIGHT,         GFX_BELT4_RIGHT         },
+    { EL_CONVEYOR_BELT4_SWITCH_LEFT,   GFX_BELT4_SWITCH_LEFT   },
+    { EL_CONVEYOR_BELT4_SWITCH_MIDDLE, GFX_BELT4_SWITCH_MIDDLE },
+    { EL_CONVEYOR_BELT4_SWITCH_RIGHT,  GFX_BELT4_SWITCH_RIGHT  },
     { EL_LANDMINE,                     GFX_LANDMINE            },
     { EL_ENVELOPE,                     GFX_ENVELOPE            },
-    { EL_LIGHT_SWITCH_OFF,             GFX_LIGHT_SWITCH_OFF    },
-    { EL_LIGHT_SWITCH_ON,              GFX_LIGHT_SWITCH_ON     },
+    { EL_LIGHT_SWITCH,                 GFX_LIGHT_SWITCH_OFF    },
+    { EL_LIGHT_SWITCH_ACTIVE,          GFX_LIGHT_SWITCH_ON     },
     { EL_SIGN_EXCLAMATION,             GFX_SIGN_EXCLAMATION    },
     { EL_SIGN_RADIOACTIVITY,           GFX_SIGN_RADIOACTIVITY  },
     { EL_SIGN_STOP,                    GFX_SIGN_STOP           },
@@ -776,7 +776,7 @@ void InitElementInfo()
     { EL_MOLE_RIGHT,                   GFX_MOLE_RIGHT          },
     { EL_MOLE_UP,                      GFX_MOLE_UP             },
     { EL_MOLE_DOWN,                    GFX_MOLE_DOWN           },
-    { EL_STEEL_SLANTED,                        GFX_STEEL_SLANTED       },
+    { EL_STEELWALL_SLANTED,            GFX_STEEL_SLANTED       },
     { EL_SAND_INVISIBLE,               GFX_SAND_INVISIBLE      },
     { EL_DX_UNKNOWN_15,                        GFX_DX_UNKNOWN_15       },
     { EL_DX_UNKNOWN_42,                        GFX_DX_UNKNOWN_42       },
@@ -790,18 +790,18 @@ void InitElementInfo()
     { EL_BALLOON_SEND_UP,              GFX_BALLOON_SEND_UP     },
     { EL_BALLOON_SEND_DOWN,            GFX_BALLOON_SEND_DOWN   },
     { EL_BALLOON_SEND_ANY,             GFX_BALLOON_SEND_ANY    },
-    { EL_EMC_STEEL_WALL_1,             GFX_EMC_STEEL_WALL_1    },
-    { EL_EMC_STEEL_WALL_2,             GFX_EMC_STEEL_WALL_2    },
-    { EL_EMC_STEEL_WALL_3,             GFX_EMC_STEEL_WALL_3    },
-    { EL_EMC_STEEL_WALL_4,             GFX_EMC_STEEL_WALL_4    },
-    { EL_EMC_WALL_1,                   GFX_EMC_WALL_1          },
-    { EL_EMC_WALL_2,                   GFX_EMC_WALL_2          },
-    { EL_EMC_WALL_3,                   GFX_EMC_WALL_3          },
-    { EL_EMC_WALL_4,                   GFX_EMC_WALL_4          },
-    { EL_EMC_WALL_5,                   GFX_EMC_WALL_5          },
-    { EL_EMC_WALL_6,                   GFX_EMC_WALL_6          },
-    { EL_EMC_WALL_7,                   GFX_EMC_WALL_7          },
-    { EL_EMC_WALL_8,                   GFX_EMC_WALL_8          },
+    { EL_EMC_STEELWALL1,               GFX_EMC_STEEL_WALL_1    },
+    { EL_EMC_STEELWALL2,               GFX_EMC_STEEL_WALL_2    },
+    { EL_EMC_STEELWALL3,               GFX_EMC_STEEL_WALL_3    },
+    { EL_EMC_STEELWALL4,               GFX_EMC_STEEL_WALL_4    },
+    { EL_EMC_WALL_PILLAR_UPPER,                GFX_EMC_WALL_1          },
+    { EL_EMC_WALL_PILLAR_MIDDLE,       GFX_EMC_WALL_2          },
+    { EL_EMC_WALL_PILLAR_LOWER,                GFX_EMC_WALL_3          },
+    { EL_EMC_WALL4,                    GFX_EMC_WALL_4          },
+    { EL_EMC_WALL5,                    GFX_EMC_WALL_5          },
+    { EL_EMC_WALL6,                    GFX_EMC_WALL_6          },
+    { EL_EMC_WALL7,                    GFX_EMC_WALL_7          },
+    { EL_EMC_WALL8,                    GFX_EMC_WALL_8          },
     { EL_TUBE_CROSS,                   GFX_TUBE_CROSS          },
     { EL_TUBE_VERTICAL,                        GFX_TUBE_VERTICAL       },
     { EL_TUBE_HORIZONTAL,              GFX_TUBE_HORIZONTAL     },
@@ -850,32 +850,32 @@ void InitElementInfo()
       IMG_PACMAN_UP,           IMG_PACMAN_DOWN
     },
     {
-      EL_SPIELER1,
+      EL_PLAYER1,
       IMG_PLAYER1_LEFT,                IMG_PLAYER1_RIGHT,
       IMG_PLAYER1_UP,          IMG_PLAYER1_DOWN
     },
     {
-      EL_SPIELER2,
+      EL_PLAYER2,
       IMG_PLAYER2_LEFT,                IMG_PLAYER2_RIGHT,
       IMG_PLAYER2_UP,          IMG_PLAYER2_DOWN
     },
     {
-      EL_SPIELER3,
+      EL_PLAYER3,
       IMG_PLAYER3_LEFT,                IMG_PLAYER3_RIGHT,
       IMG_PLAYER3_UP,          IMG_PLAYER3_DOWN
     },
     {
-      EL_SPIELER4,
+      EL_PLAYER4,
       IMG_PLAYER4_LEFT,                IMG_PLAYER4_RIGHT,
       IMG_PLAYER4_UP,          IMG_PLAYER4_DOWN
     },
     {
-      EL_SCHWEIN,
+      EL_PIG,
       IMG_PIG_LEFT,            IMG_PIG_RIGHT,
       IMG_PIG_UP,              IMG_PIG_DOWN
     },
     {
-      EL_DRACHE,
+      EL_DRAGON,
       IMG_DRAGON_LEFT,         IMG_DRAGON_RIGHT,
       IMG_DRAGON_UP,           IMG_DRAGON_DOWN
     },
@@ -885,7 +885,7 @@ void InitElementInfo()
       IMG_MOLE_UP,             IMG_MOLE_DOWN
     },
     {
-      EL_PINGUIN,
+      EL_PENGUIN,
       IMG_PENGUIN_LEFT,                IMG_PENGUIN_RIGHT,
       IMG_PENGUIN_UP,          IMG_PENGUIN_DOWN
     },
@@ -1070,10 +1070,10 @@ void InitElementProperties()
     EL_KEY2,
     EL_KEY3,
     EL_KEY4,
-    EL_EM_KEY_1,
-    EL_EM_KEY_2,
-    EL_EM_KEY_3,
-    EL_EM_KEY_4
+    EL_EM_KEY1,
+    EL_EM_KEY2,
+    EL_EM_KEY3,
+    EL_EM_KEY4
   };
   static int ep_schluessel_num = SIZEOF_ARRAY_INT(ep_schluessel);
 
@@ -1087,14 +1087,14 @@ void InitElementProperties()
     EL_GATE2_GRAY,
     EL_GATE3_GRAY,
     EL_GATE4_GRAY,
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1X,
-    EL_EM_GATE_2X,
-    EL_EM_GATE_3X,
-    EL_EM_GATE_4X,
+    EL_EM_GATE1,
+    EL_EM_GATE2,
+    EL_EM_GATE3,
+    EL_EM_GATE4,
+    EL_EM_GATE1_GRAY,
+    EL_EM_GATE2_GRAY,
+    EL_EM_GATE3_GRAY,
+    EL_EM_GATE4_GRAY,
     EL_SWITCHGATE_OPEN,
     EL_SWITCHGATE_OPENING,
     EL_SWITCHGATE_CLOSED,
@@ -1121,10 +1121,10 @@ void InitElementProperties()
   {
     EL_STEELWALL,
     EL_WALL,
-    EL_MAUER_LEBT,
-    EL_MAUER_X,
-    EL_MAUER_Y,
-    EL_MAUER_XY,
+    EL_WALL_GROWING,
+    EL_WALL_GROWING_X,
+    EL_WALL_GROWING_Y,
+    EL_WALL_GROWING_XY,
     EL_BD_WALL,
     EL_WALL_CRUMBLED,
     EL_EXIT_CLOSED,
@@ -1176,24 +1176,24 @@ void InitElementProperties()
     EL_SP_HARD_BASE6,
     EL_SP_TERMINAL,
     EL_SP_TERMINAL_ACTIVE,
-    EL_SP_EXIT,
-    EL_INVISIBLE_STEEL,
-    EL_BELT1_SWITCH_LEFT,
-    EL_BELT1_SWITCH_MIDDLE,
-    EL_BELT1_SWITCH_RIGHT,
-    EL_BELT2_SWITCH_LEFT,
-    EL_BELT2_SWITCH_MIDDLE,
-    EL_BELT2_SWITCH_RIGHT,
-    EL_BELT3_SWITCH_LEFT,
-    EL_BELT3_SWITCH_MIDDLE,
-    EL_BELT3_SWITCH_RIGHT,
-    EL_BELT4_SWITCH_LEFT,
-    EL_BELT4_SWITCH_MIDDLE,
-    EL_BELT4_SWITCH_RIGHT,
-    EL_SWITCHGATE_SWITCH_1,
-    EL_SWITCHGATE_SWITCH_2,
-    EL_LIGHT_SWITCH_OFF,
-    EL_LIGHT_SWITCH_ON,
+    EL_SP_EXIT_CLOSED,
+    EL_INVISIBLE_STEELWALL,
+    EL_CONVEYOR_BELT1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT1_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT2_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT2_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT3_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT3_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT4_SWITCH_LEFT,
+    EL_CONVEYOR_BELT4_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT4_SWITCH_RIGHT,
+    EL_SWITCHGATE_SWITCH_UP,
+    EL_SWITCHGATE_SWITCH_DOWN,
+    EL_LIGHT_SWITCH,
+    EL_LIGHT_SWITCH_ACTIVE,
     EL_TIMEGATE_SWITCH_OFF,
     EL_TIMEGATE_SWITCH_ON,
     EL_SIGN_EXCLAMATION,
@@ -1208,19 +1208,19 @@ void InitElementProperties()
     EL_SIGN_EXIT,
     EL_SIGN_YINYANG,
     EL_SIGN_OTHER,
-    EL_STEEL_SLANTED,
-    EL_EMC_STEEL_WALL_1,
-    EL_EMC_STEEL_WALL_2,
-    EL_EMC_STEEL_WALL_3,
-    EL_EMC_STEEL_WALL_4,
-    EL_EMC_WALL_1,
-    EL_EMC_WALL_2,
-    EL_EMC_WALL_3,
-    EL_EMC_WALL_4,
-    EL_EMC_WALL_5,
-    EL_EMC_WALL_6,
-    EL_EMC_WALL_7,
-    EL_EMC_WALL_8,
+    EL_STEELWALL_SLANTED,
+    EL_EMC_STEELWALL1,
+    EL_EMC_STEELWALL2,
+    EL_EMC_STEELWALL3,
+    EL_EMC_STEELWALL4,
+    EL_EMC_WALL_PILLAR_UPPER,
+    EL_EMC_WALL_PILLAR_MIDDLE,
+    EL_EMC_WALL_PILLAR_LOWER,
+    EL_EMC_WALL4,
+    EL_EMC_WALL5,
+    EL_EMC_WALL6,
+    EL_EMC_WALL7,
+    EL_EMC_WALL8,
     EL_CRYSTAL,
     EL_WALL_PEARL,
     EL_WALL_CRYSTAL,
@@ -1232,14 +1232,14 @@ void InitElementProperties()
     EL_GATE2_GRAY,
     EL_GATE3_GRAY,
     EL_GATE4_GRAY,
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1X,
-    EL_EM_GATE_2X,
-    EL_EM_GATE_3X,
-    EL_EM_GATE_4X,
+    EL_EM_GATE1,
+    EL_EM_GATE2,
+    EL_EM_GATE3,
+    EL_EM_GATE4,
+    EL_EM_GATE1_GRAY,
+    EL_EM_GATE2_GRAY,
+    EL_EM_GATE3_GRAY,
+    EL_EM_GATE4_GRAY,
     EL_SWITCHGATE_OPEN,
     EL_SWITCHGATE_OPENING,
     EL_SWITCHGATE_CLOSED,
@@ -1282,21 +1282,21 @@ void InitElementProperties()
     EL_SP_HARD_BASE4,
     EL_SP_HARD_BASE5,
     EL_SP_HARD_BASE6,
-    EL_INVISIBLE_STEEL,
-    EL_BELT1_SWITCH_LEFT,
-    EL_BELT1_SWITCH_MIDDLE,
-    EL_BELT1_SWITCH_RIGHT,
-    EL_BELT2_SWITCH_LEFT,
-    EL_BELT2_SWITCH_MIDDLE,
-    EL_BELT2_SWITCH_RIGHT,
-    EL_BELT3_SWITCH_LEFT,
-    EL_BELT3_SWITCH_MIDDLE,
-    EL_BELT3_SWITCH_RIGHT,
-    EL_BELT4_SWITCH_LEFT,
-    EL_BELT4_SWITCH_MIDDLE,
-    EL_BELT4_SWITCH_RIGHT,
-    EL_LIGHT_SWITCH_OFF,
-    EL_LIGHT_SWITCH_ON,
+    EL_INVISIBLE_STEELWALL,
+    EL_CONVEYOR_BELT1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT1_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT2_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT2_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT3_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT3_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT4_SWITCH_LEFT,
+    EL_CONVEYOR_BELT4_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT4_SWITCH_RIGHT,
+    EL_LIGHT_SWITCH,
+    EL_LIGHT_SWITCH_ACTIVE,
     EL_SIGN_EXCLAMATION,
     EL_SIGN_RADIOACTIVITY,
     EL_SIGN_STOP,
@@ -1309,11 +1309,11 @@ void InitElementProperties()
     EL_SIGN_EXIT,
     EL_SIGN_YINYANG,
     EL_SIGN_OTHER,
-    EL_STEEL_SLANTED,
-    EL_EMC_STEEL_WALL_1,
-    EL_EMC_STEEL_WALL_2,
-    EL_EMC_STEEL_WALL_3,
-    EL_EMC_STEEL_WALL_4,
+    EL_STEELWALL_SLANTED,
+    EL_EMC_STEELWALL1,
+    EL_EMC_STEELWALL2,
+    EL_EMC_STEELWALL3,
+    EL_EMC_STEELWALL4,
     EL_CRYSTAL,
     EL_GATE1,
     EL_GATE2,
@@ -1323,14 +1323,14 @@ void InitElementProperties()
     EL_GATE2_GRAY,
     EL_GATE3_GRAY,
     EL_GATE4_GRAY,
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1X,
-    EL_EM_GATE_2X,
-    EL_EM_GATE_3X,
-    EL_EM_GATE_4X,
+    EL_EM_GATE1,
+    EL_EM_GATE2,
+    EL_EM_GATE3,
+    EL_EM_GATE4,
+    EL_EM_GATE1_GRAY,
+    EL_EM_GATE2_GRAY,
+    EL_EM_GATE3_GRAY,
+    EL_EM_GATE4_GRAY,
     EL_SWITCHGATE_OPEN,
     EL_SWITCHGATE_OPENING,
     EL_SWITCHGATE_CLOSED,
@@ -1360,10 +1360,10 @@ void InitElementProperties()
     EL_ROCK,
     EL_BD_ROCK,
     EL_EMERALD,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_YELLOW,
-    EL_EDELSTEIN_RED,
-    EL_EDELSTEIN_PURPLE,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
     EL_DIAMOND,
     EL_BOMB,
     EL_NUT,
@@ -1375,7 +1375,7 @@ void InitElementProperties()
     EL_LAMP,
     EL_ACIDPOOL_TOPLEFT,
     EL_ACIDPOOL_TOPRIGHT,
-    EL_SONDE,
+    EL_SATELLITE,
     EL_SP_ZONK,
     EL_SP_INFOTRON,
     EL_SP_CHIP_SINGLE,
@@ -1384,7 +1384,7 @@ void InitElementProperties()
     EL_SP_CHIP_UPPER,
     EL_SP_CHIP_LOWER,
     EL_SPEED_PILL,
-    EL_STEEL_SLANTED,
+    EL_STEELWALL_SLANTED,
     EL_PEARL,
     EL_CRYSTAL
   };
@@ -1416,23 +1416,23 @@ void InitElementProperties()
     EL_GATE2_GRAY,
     EL_GATE3_GRAY,
     EL_GATE4_GRAY,
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1X,
-    EL_EM_GATE_2X,
-    EL_EM_GATE_3X,
-    EL_EM_GATE_4X,
+    EL_EM_GATE1,
+    EL_EM_GATE2,
+    EL_EM_GATE3,
+    EL_EM_GATE4,
+    EL_EM_GATE1_GRAY,
+    EL_EM_GATE2_GRAY,
+    EL_EM_GATE3_GRAY,
+    EL_EM_GATE4_GRAY,
     EL_EXIT_CLOSED,
     EL_AUSGANG_ACT,
     EL_EXIT_OPEN,
     EL_WALL,
     EL_WALL_CRUMBLED,
-    EL_MAUER_LEBT,
-    EL_MAUER_X,
-    EL_MAUER_Y,
-    EL_MAUER_XY,
+    EL_WALL_GROWING,
+    EL_WALL_GROWING_X,
+    EL_WALL_GROWING_Y,
+    EL_WALL_GROWING_XY,
     EL_MAUERND,
     EL_BD_WALL,
     EL_SP_CHIP_SINGLE,
@@ -1453,21 +1453,21 @@ void InitElementProperties()
     EL_SP_HARD_BASE6,
     EL_SP_TERMINAL,
     EL_SP_TERMINAL_ACTIVE,
-    EL_SP_EXIT,
-    EL_INVISIBLE_STEEL,
-    EL_STEEL_SLANTED,
-    EL_EMC_STEEL_WALL_1,
-    EL_EMC_STEEL_WALL_2,
-    EL_EMC_STEEL_WALL_3,
-    EL_EMC_STEEL_WALL_4,
-    EL_EMC_WALL_1,
-    EL_EMC_WALL_2,
-    EL_EMC_WALL_3,
-    EL_EMC_WALL_4,
-    EL_EMC_WALL_5,
-    EL_EMC_WALL_6,
-    EL_EMC_WALL_7,
-    EL_EMC_WALL_8
+    EL_SP_EXIT_CLOSED,
+    EL_INVISIBLE_STEELWALL,
+    EL_STEELWALL_SLANTED,
+    EL_EMC_STEELWALL1,
+    EL_EMC_STEELWALL2,
+    EL_EMC_STEELWALL3,
+    EL_EMC_STEELWALL4,
+    EL_EMC_WALL_PILLAR_UPPER,
+    EL_EMC_WALL_PILLAR_MIDDLE,
+    EL_EMC_WALL_PILLAR_LOWER,
+    EL_EMC_WALL4,
+    EL_EMC_WALL5,
+    EL_EMC_WALL6,
+    EL_EMC_WALL7,
+    EL_EMC_WALL8
   };
   static int ep_mauer_num = SIZEOF_ARRAY_INT(ep_mauer);
 
@@ -1476,10 +1476,10 @@ void InitElementProperties()
     EL_ROCK,
     EL_BD_ROCK,
     EL_EMERALD,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_YELLOW,
-    EL_EDELSTEIN_RED,
-    EL_EDELSTEIN_PURPLE,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
     EL_DIAMOND,
     EL_BOMB,
     EL_NUT,
@@ -1504,19 +1504,19 @@ void InitElementProperties()
     EL_ROCK,
     EL_BD_ROCK,
     EL_EMERALD,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_YELLOW,
-    EL_EDELSTEIN_RED,
-    EL_EDELSTEIN_PURPLE,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
     EL_DIAMOND,
     EL_KEY1,
     EL_KEY2,
     EL_KEY3,
     EL_KEY4,
-    EL_EM_KEY_1,
-    EL_EM_KEY_2,
-    EL_EM_KEY_3,
-    EL_EM_KEY_4,
+    EL_EM_KEY1,
+    EL_EM_KEY2,
+    EL_EM_KEY3,
+    EL_EM_KEY4,
     EL_BOMB,
     EL_NUT,
     EL_AMOEBA_DROP,
@@ -1537,10 +1537,10 @@ void InitElementProperties()
     EL_ROCK,
     EL_BD_ROCK,
     EL_EMERALD,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_YELLOW,
-    EL_EDELSTEIN_RED,
-    EL_EDELSTEIN_PURPLE,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
     EL_DIAMOND
   };
   static int ep_can_change_num = SIZEOF_ARRAY_INT(ep_can_change);
@@ -1556,10 +1556,10 @@ void InitElementProperties()
     EL_ROBOT,
     EL_PACMAN,
     EL_MOLE,
-    EL_PINGUIN,
-    EL_SCHWEIN,
-    EL_DRACHE,
-    EL_SONDE,
+    EL_PENGUIN,
+    EL_PIG,
+    EL_DRAGON,
+    EL_SATELLITE,
     EL_SP_SNIKSNAK,
     EL_SP_ELECTRON,
     EL_BALLOON,
@@ -1638,10 +1638,10 @@ void InitElementProperties()
     EL_AMOEBA_FULL,
     EL_BD_AMOEBA,
     EL_EMERALD,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_YELLOW,
-    EL_EDELSTEIN_RED,
-    EL_EDELSTEIN_PURPLE,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
     EL_DIAMOND,
     EL_PEARL,
     EL_CRYSTAL
@@ -1656,7 +1656,7 @@ void InitElementProperties()
     EL_BD_WALL,
     EL_ROCK,
     EL_BD_ROCK,
-    EL_EDELSTEIN_BD,
+    EL_BD_DIAMOND,
     EL_MAGIC_WALL_BD_OFF,
     EL_EXIT_CLOSED,
     EL_EXIT_OPEN,
@@ -1673,7 +1673,7 @@ void InitElementProperties()
     EL_BUTTERFLY_3,
     EL_BUTTERFLY_4,
     EL_BD_AMOEBA,
-    EL_CHAR_FRAGE
+    EL_CHAR_QUESTION
   };
   static int ep_bd_element_num = SIZEOF_ARRAY_INT(ep_bd_element);
 
@@ -1685,17 +1685,17 @@ void InitElementProperties()
     EL_SOKOBAN_FELD_LEER,
     EL_SOKOBAN_FELD_VOLL,
     EL_PLAYER,
-    EL_INVISIBLE_STEEL
+    EL_INVISIBLE_STEELWALL
   };
   static int ep_sb_element_num = SIZEOF_ARRAY_INT(ep_sb_element);
 
   static int ep_gem[] =
   {
     EL_EMERALD,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_YELLOW,
-    EL_EDELSTEIN_RED,
-    EL_EDELSTEIN_PURPLE,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
     EL_DIAMOND
   };
   static int ep_gem_num = SIZEOF_ARRAY_INT(ep_gem);
@@ -1711,16 +1711,16 @@ void InitElementProperties()
     EL_STEELWALL,
     EL_AMOEBA_DEAD,
     EL_QUICKSAND_EMPTY,
-    EL_BADEWANNE,
+    EL_STONEBLOCK,
     EL_ROBOT_WHEEL,
     EL_KEY1,
     EL_KEY2,
     EL_KEY3,
     EL_KEY4,
-    EL_EM_KEY_1,
-    EL_EM_KEY_2,
-    EL_EM_KEY_3,
-    EL_EM_KEY_4,
+    EL_EM_KEY1,
+    EL_EM_KEY2,
+    EL_EM_KEY3,
+    EL_EM_KEY4,
     EL_GATE1,
     EL_GATE2,
     EL_GATE3,
@@ -1729,14 +1729,14 @@ void InitElementProperties()
     EL_GATE2_GRAY,
     EL_GATE3_GRAY,
     EL_GATE4_GRAY,
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1X,
-    EL_EM_GATE_2X,
-    EL_EM_GATE_3X,
-    EL_EM_GATE_4X,
+    EL_EM_GATE1,
+    EL_EM_GATE2,
+    EL_EM_GATE3,
+    EL_EM_GATE4,
+    EL_EM_GATE1_GRAY,
+    EL_EM_GATE2_GRAY,
+    EL_EM_GATE3_GRAY,
+    EL_EM_GATE4_GRAY,
     EL_DYNAMITE,
     EL_INVISIBLE_WALL,
     EL_LAMP,
@@ -1762,7 +1762,7 @@ void InitElementProperties()
     EL_MAGIC_WALL_DEAD,
     EL_MAGIC_WALL_BD_OFF,
     EL_MAGIC_WALL_BD_DEAD,
-    EL_AMOEBA2DIAM,
+    EL_AMOEBA_TO_DIAMOND,
     EL_BLOCKED,
     EL_SP_EMPTY,
     EL_SP_BASE,
@@ -1795,20 +1795,20 @@ void InitElementProperties()
     EL_SP_HARD_BASE4,
     EL_SP_HARD_BASE5,
     EL_SP_HARD_BASE6,
-    EL_SP_EXIT,
-    EL_INVISIBLE_STEEL,
-    EL_BELT1_SWITCH_LEFT,
-    EL_BELT1_SWITCH_MIDDLE,
-    EL_BELT1_SWITCH_RIGHT,
-    EL_BELT2_SWITCH_LEFT,
-    EL_BELT2_SWITCH_MIDDLE,
-    EL_BELT2_SWITCH_RIGHT,
-    EL_BELT3_SWITCH_LEFT,
-    EL_BELT3_SWITCH_MIDDLE,
-    EL_BELT3_SWITCH_RIGHT,
-    EL_BELT4_SWITCH_LEFT,
-    EL_BELT4_SWITCH_MIDDLE,
-    EL_BELT4_SWITCH_RIGHT,
+    EL_SP_EXIT_CLOSED,
+    EL_INVISIBLE_STEELWALL,
+    EL_CONVEYOR_BELT1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT1_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT2_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT2_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT3_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT3_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT4_SWITCH_LEFT,
+    EL_CONVEYOR_BELT4_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT4_SWITCH_RIGHT,
     EL_SIGN_EXCLAMATION,
     EL_SIGN_RADIOACTIVITY,
     EL_SIGN_STOP,
@@ -1821,19 +1821,19 @@ void InitElementProperties()
     EL_SIGN_EXIT,
     EL_SIGN_YINYANG,
     EL_SIGN_OTHER,
-    EL_STEEL_SLANTED,
-    EL_EMC_STEEL_WALL_1,
-    EL_EMC_STEEL_WALL_2,
-    EL_EMC_STEEL_WALL_3,
-    EL_EMC_STEEL_WALL_4,
-    EL_EMC_WALL_1,
-    EL_EMC_WALL_2,
-    EL_EMC_WALL_3,
-    EL_EMC_WALL_4,
-    EL_EMC_WALL_5,
-    EL_EMC_WALL_6,
-    EL_EMC_WALL_7,
-    EL_EMC_WALL_8
+    EL_STEELWALL_SLANTED,
+    EL_EMC_STEELWALL1,
+    EL_EMC_STEELWALL2,
+    EL_EMC_STEELWALL3,
+    EL_EMC_STEELWALL4,
+    EL_EMC_WALL_PILLAR_UPPER,
+    EL_EMC_WALL_PILLAR_MIDDLE,
+    EL_EMC_WALL_PILLAR_LOWER,
+    EL_EMC_WALL4,
+    EL_EMC_WALL5,
+    EL_EMC_WALL6,
+    EL_EMC_WALL7,
+    EL_EMC_WALL8
   };
   static int ep_inactive_num = SIZEOF_ARRAY_INT(ep_inactive);
 
@@ -1851,10 +1851,10 @@ void InitElementProperties()
     EL_DYNABOMB_XL,
     EL_BUG,
     EL_MOLE,
-    EL_PINGUIN,
-    EL_SCHWEIN,
-    EL_DRACHE,
-    EL_SONDE,
+    EL_PENGUIN,
+    EL_PIG,
+    EL_DRAGON,
+    EL_SATELLITE,
     EL_SP_DISK_RED,
     EL_SP_DISK_ORANGE,
     EL_SP_DISK_YELLOW,
@@ -1867,10 +1867,10 @@ void InitElementProperties()
   static int ep_mampf3[] =
   {
     EL_EMERALD,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_YELLOW,
-    EL_EDELSTEIN_RED,
-    EL_EDELSTEIN_PURPLE,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
     EL_DIAMOND,
     EL_PEARL,
     EL_CRYSTAL
@@ -1886,7 +1886,7 @@ void InitElementProperties()
     EL_TIME_ORB_EMPTY,
     EL_SOKOBAN_FELD_VOLL,
     EL_SOKOBAN_OBJEKT,
-    EL_SONDE,
+    EL_SATELLITE,
     EL_SP_ZONK,
     EL_SP_DISK_ORANGE,
     EL_SP_DISK_YELLOW,
@@ -1899,10 +1899,10 @@ void InitElementProperties()
   static int ep_player[] =
   {
     EL_PLAYER,
-    EL_SPIELER1,
-    EL_SPIELER2,
-    EL_SPIELER3,
-    EL_SPIELER4
+    EL_PLAYER1,
+    EL_PLAYER2,
+    EL_PLAYER3,
+    EL_PLAYER4
   };
   static int ep_player_num = SIZEOF_ARRAY_INT(ep_player);
 
@@ -1935,7 +1935,7 @@ void InitElementProperties()
     EL_SP_INFOTRON,
     EL_SP_CHIP_SINGLE,
     EL_SP_HARD_GRAY,
-    EL_SP_EXIT,
+    EL_SP_EXIT_CLOSED,
     EL_SP_DISK_ORANGE,
     EL_SP_PORT1_RIGHT,
     EL_SP_PORT1_DOWN,
@@ -1977,14 +1977,14 @@ void InitElementProperties()
 
   static int ep_quick_gate[] =
   {
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1X,
-    EL_EM_GATE_2X,
-    EL_EM_GATE_3X,
-    EL_EM_GATE_4X,
+    EL_EM_GATE1,
+    EL_EM_GATE2,
+    EL_EM_GATE3,
+    EL_EM_GATE4,
+    EL_EM_GATE1_GRAY,
+    EL_EM_GATE2_GRAY,
+    EL_EM_GATE3_GRAY,
+    EL_EM_GATE4_GRAY,
     EL_SP_PORT1_LEFT,
     EL_SP_PORT2_LEFT,
     EL_SP_PORT1_RIGHT,
@@ -2040,35 +2040,35 @@ void InitElementProperties()
 
   static int ep_belt[] =
   {
-    EL_BELT1_LEFT,
-    EL_BELT1_MIDDLE,
-    EL_BELT1_RIGHT,
-    EL_BELT2_LEFT,
-    EL_BELT2_MIDDLE,
-    EL_BELT2_RIGHT,
-    EL_BELT3_LEFT,
-    EL_BELT3_MIDDLE,
-    EL_BELT3_RIGHT,
-    EL_BELT4_LEFT,
-    EL_BELT4_MIDDLE,
-    EL_BELT4_RIGHT,
+    EL_CONVEYOR_BELT1_LEFT,
+    EL_CONVEYOR_BELT1_MIDDLE,
+    EL_CONVEYOR_BELT1_RIGHT,
+    EL_CONVEYOR_BELT2_LEFT,
+    EL_CONVEYOR_BELT2_MIDDLE,
+    EL_CONVEYOR_BELT2_RIGHT,
+    EL_CONVEYOR_BELT3_LEFT,
+    EL_CONVEYOR_BELT3_MIDDLE,
+    EL_CONVEYOR_BELT3_RIGHT,
+    EL_CONVEYOR_BELT4_LEFT,
+    EL_CONVEYOR_BELT4_MIDDLE,
+    EL_CONVEYOR_BELT4_RIGHT,
   };
   static int ep_belt_num = SIZEOF_ARRAY_INT(ep_belt);
 
   static int ep_belt_switch[] =
   {
-    EL_BELT1_SWITCH_LEFT,
-    EL_BELT1_SWITCH_MIDDLE,
-    EL_BELT1_SWITCH_RIGHT,
-    EL_BELT2_SWITCH_LEFT,
-    EL_BELT2_SWITCH_MIDDLE,
-    EL_BELT2_SWITCH_RIGHT,
-    EL_BELT3_SWITCH_LEFT,
-    EL_BELT3_SWITCH_MIDDLE,
-    EL_BELT3_SWITCH_RIGHT,
-    EL_BELT4_SWITCH_LEFT,
-    EL_BELT4_SWITCH_MIDDLE,
-    EL_BELT4_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT1_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT2_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT2_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT3_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT3_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT4_SWITCH_LEFT,
+    EL_CONVEYOR_BELT4_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT4_SWITCH_RIGHT,
   };
   static int ep_belt_switch_num = SIZEOF_ARRAY_INT(ep_belt_switch);
 
index ec003823255dbc89b4f4660597fb52953720e6db..415b6bfbb104073720bda8885b458b3683adc0fb 100644 (file)
@@ -55,7 +55,7 @@ int           lev_fieldx,lev_fieldy, scroll_x,scroll_y;
 int            FX = SX, FY = SY, ScrollStepSize;
 int            ScreenMovDir = MV_NO_MOVING, ScreenMovPos = 0;
 int            ScreenGfxPos = 0;
-int            BorderElement = EL_BETON;
+int            BorderElement = EL_STEELWALL;
 int            GameFrameDelay = GAME_FRAME_DELAY;
 int            FfwdFrameDelay = FFWD_FRAME_DELAY;
 int            BX1 = 0, BY1 = 0, BX2 = SCR_FIELDX-1, BY2 = SCR_FIELDY-1;
index be10b88c134b08bfa12ca6e0d4221ed6f7781498..84e8bf00d66220f45555928db34875e3046df3d8 100644 (file)
 #define IS_FALLING(x,y)                (MovPos[x][y] != 0 && MovDir[x][y] == MV_DOWN)
 #define IS_BLOCKED(x,y)                (Feld[x][y] == EL_BLOCKED)
 
-#define EL_CHANGED(e)          ((e) == EL_FELSBROCKEN    ? EL_EMERALD :  \
-                                (e) == EL_BD_ROCK        ? EL_EDELSTEIN_BD : \
+#define EL_CHANGED(e)          ((e) == EL_ROCK           ? EL_EMERALD :    \
+                                (e) == EL_BD_ROCK        ? EL_BD_DIAMOND : \
                                 (e) == EL_EMERALD        ? EL_DIAMOND :    \
-                                (e) == EL_EDELSTEIN_YELLOW ? EL_DIAMOND :    \
-                                (e) == EL_EDELSTEIN_RED  ? EL_DIAMOND :    \
-                                (e) == EL_EDELSTEIN_PURPLE ? EL_DIAMOND :    \
-                                EL_FELSBROCKEN)
-#define EL_CHANGED2(e)         ((e) == EL_FELSBROCKEN ? EL_EDELSTEIN_BD :  \
-                                (e) == EL_BD_ROCK     ? EL_EDELSTEIN_BD : \
+                                (e) == EL_EMERALD_YELLOW ? EL_DIAMOND :    \
+                                (e) == EL_EMERALD_RED    ? EL_DIAMOND :    \
+                                (e) == EL_EMERALD_PURPLE ? EL_DIAMOND :    \
+                                EL_ROCK)
+#define EL_CHANGED2(e)         ((e) == EL_ROCK           ? EL_BD_DIAMOND : \
+                                (e) == EL_BD_ROCK        ? EL_BD_DIAMOND : \
                                 EL_BD_ROCK)
 #define IS_DRAWABLE(e)         ((e) < EL_BLOCKED)
 #define IS_NOT_DRAWABLE(e)     ((e) >= EL_BLOCKED)
 #define TAPE_IS_EMPTY(x)       ((x).length == 0)
 #define TAPE_IS_STOPPED(x)     (!(x).recording && !(x).playing)
 
-#define PLAYERINFO(x,y)                (&stored_player[StorePlayer[x][y]-EL_SPIELER1])
+#define PLAYERINFO(x,y)                (&stored_player[StorePlayer[x][y]-EL_PLAYER1])
 #define SHIELD_ON(p)           ((p)->shield_passive_time_left > 0)
 #define PROTECTED_FIELD(x,y)   (IS_TUBE(Feld[x][y]))
 #define PLAYER_PROTECTED(x,y)  (SHIELD_ON(PLAYERINFO(x, y)) ||         \
 **      xxx <= element < yyy: flag elements, only used at runtime
 */
 /* "real" level elements */
-#define EL_EMPTY_SPACE         0
-#define EL_EMPTY               EL_EMPTY_SPACE
-#define        EL_SAND                 1
-#define        EL_WALL                 2
-#define        EL_WALL_CRUMBLED        3
-#define        EL_ROCK                 4
-#define        EL_KEY                  5
-#define        EL_EMERALD              6
-#define        EL_EXIT_CLOSED          7
-#define        EL_PLAYER               8
-#define EL_BUG                 9
-#define EL_SPACESHIP           10
-#define EL_YAMYAM              11
-#define EL_ROBOT               12
-#define EL_STEELWALL           13
-#define EL_DIAMOND             14
-#define EL_AMOEBA_DEAD         15
-#define EL_QUICKSAND_EMPTY     16
-#define EL_QUICKSAND_FULL      17
-#define EL_AMOEBA_DROP         18
-#define EL_BOMB                        19
-#define EL_MAGIC_WALL          20
-#define EL_SPEED_PILL          21
-#define EL_ACID                        22
-#define EL_AMOEBA_WET          23
-#define EL_AMOEBA_DRY          24
-#define EL_NUT                 25
-#define EL_GAMEOFLIFE          26
-#define EL_BIOMAZE             27
-#define EL_DYNAMITE_ACTIVE     28
-#define EL_STONEBLOCK          29
-#define EL_ROBOT_WHEEL         30
-#define EL_ROBOT_WHEEL_ACTIVE  31
-#define EL_KEY1                        32
-#define EL_KEY2                        33
-#define EL_KEY3                        34
-#define EL_KEY4                        35
-#define EL_GATE1               36
-#define EL_GATE2               37
-#define EL_GATE3               38
-#define EL_GATE4               39
-#define EL_GATE1_GRAY          40
-#define EL_GATE2_GRAY          41
-#define EL_GATE3_GRAY          42
-#define EL_GATE4_GRAY          43
-#define EL_DYNAMITE            44
-#define EL_PACMAN              45
-#define EL_INVISIBLE_WALL      46
-#define EL_LAMP                        47
-#define EL_LAMP_ACTIVE         48
-#define EL_WALL_EMERALD                49
-#define EL_WALL_DIAMOND                50
-#define EL_AMOEBA_FULL         51
-#define EL_BD_AMOEBA           52
-#define EL_TIME_ORB_FULL       53
-#define EL_TIME_ORB_EMPTY      54
-#define EL_MAUER_LEBT          55
-#define EL_EDELSTEIN_BD                56
-#define EL_EDELSTEIN_YELLOW    57
-#define EL_WALL_BD_DIAMOND     58
-#define EL_WALL_EMERALD_YELLOW 59
-#define EL_DARK_YAMYAM         60
-#define EL_MAGIC_WALL_BD_OFF   61
-#define EL_INVISIBLE_STEEL     62
-
-#define EL_UNUSED_63           63
-
-#define EL_DYNABOMB_NR         64
-#define EL_DYNABOMB_SZ         65
-#define EL_DYNABOMB_XL         66
-#define EL_SOKOBAN_OBJEKT      67
-#define EL_SOKOBAN_FELD_LEER   68
-#define EL_SOKOBAN_FELD_VOLL   69
-#define EL_BUTTERFLY_RIGHT     70
-#define EL_BUTTERFLY_UP                71
-#define EL_BUTTERFLY_LEFT      72
-#define EL_BUTTERFLY_DOWN      73
-#define EL_FIREFLY_RIGHT       74
-#define EL_FIREFLY_UP          75
-#define EL_FIREFLY_LEFT                76
-#define EL_FIREFLY_DOWN                77
-#define EL_BUTTERFLY_1         EL_BUTTERFLY_DOWN
-#define EL_BUTTERFLY_2         EL_BUTTERFLY_LEFT
-#define EL_BUTTERFLY_3         EL_BUTTERFLY_UP
-#define EL_BUTTERFLY_4         EL_BUTTERFLY_RIGHT
-#define EL_FIREFLY_1           EL_FIREFLY_LEFT
-#define EL_FIREFLY_2           EL_FIREFLY_DOWN
-#define EL_FIREFLY_3           EL_FIREFLY_RIGHT
-#define EL_FIREFLY_4           EL_FIREFLY_UP
-#define EL_BUTTERFLY           78
-#define EL_FIREFLY             79
-#define EL_SPIELER1            80
-#define EL_SPIELER2            81
-#define EL_SPIELER3            82
-#define EL_SPIELER4            83
-#define EL_BUG_RIGHT           84
-#define EL_BUG_UP              85
-#define EL_BUG_LEFT            86
-#define EL_BUG_DOWN            87
-#define EL_SPACESHIP_RIGHT     88
-#define EL_SPACESHIP_UP                89
-#define EL_SPACESHIP_LEFT      90
-#define EL_SPACESHIP_DOWN      91
-#define EL_PACMAN_RIGHT                92
-#define EL_PACMAN_UP           93
-#define EL_PACMAN_LEFT         94
-#define EL_PACMAN_DOWN         95
-#define EL_EDELSTEIN_RED       96
-#define EL_EDELSTEIN_PURPLE    97
-#define EL_WALL_EMERALD_RED    98
-#define EL_WALL_EMERALD_PURPLE 99
-#define EL_ACIDPOOL_TOPLEFT    100
-#define EL_ACIDPOOL_TOPRIGHT   101
-#define EL_ACIDPOOL_BOTTOMLEFT 102
-#define EL_ACIDPOOL_BOTTOM     103
-#define EL_ACIDPOOL_BOTTOMRIGHT        104
-#define EL_BD_WALL             105
-#define EL_BD_ROCK             106
-#define EL_EXIT_OPEN           107
-#define EL_BLACK_ORB           108
-#define EL_AMOEBA2DIAM         109
-#define EL_MOLE                        110
-#define EL_PINGUIN             111
-#define EL_SONDE               112
-#define EL_PFEIL_LEFT          113
-#define EL_PFEIL_RIGHT         114
-#define EL_PFEIL_UP            115
-#define EL_PFEIL_DOWN          116
-#define EL_SCHWEIN             117
-#define EL_DRACHE              118
-
-#define EL_EM_KEY1_FILE                119
-
-#define EL_CHAR_START          120
-#define EL_CHAR_ASCII0         (EL_CHAR_START-32)
-#define EL_CHAR_AUSRUF         (EL_CHAR_ASCII0+33)
-#define EL_CHAR_ZOLL           (EL_CHAR_ASCII0+34)
-#define EL_CHAR_RAUTE          (EL_CHAR_ASCII0+35)
-#define EL_CHAR_DOLLAR         (EL_CHAR_ASCII0+36)
-#define EL_CHAR_PROZ           (EL_CHAR_ASCII0+37)
-#define EL_CHAR_AMPERSAND      (EL_CHAR_ASCII0+38)
-#define EL_CHAR_APOSTR         (EL_CHAR_ASCII0+39)
-#define EL_CHAR_KLAMM1         (EL_CHAR_ASCII0+40)
-#define EL_CHAR_KLAMM2         (EL_CHAR_ASCII0+41)
-#define EL_CHAR_MULT           (EL_CHAR_ASCII0+42)
-#define EL_CHAR_PLUS           (EL_CHAR_ASCII0+43)
-#define EL_CHAR_KOMMA          (EL_CHAR_ASCII0+44)
-#define EL_CHAR_MINUS          (EL_CHAR_ASCII0+45)
-#define EL_CHAR_PUNKT          (EL_CHAR_ASCII0+46)
-#define EL_CHAR_SLASH          (EL_CHAR_ASCII0+47)
-#define EL_CHAR_0              (EL_CHAR_ASCII0+48)
-#define EL_CHAR_9              (EL_CHAR_ASCII0+57)
-#define EL_CHAR_DOPPEL         (EL_CHAR_ASCII0+58)
-#define EL_CHAR_SEMIKL         (EL_CHAR_ASCII0+59)
-#define EL_CHAR_LT             (EL_CHAR_ASCII0+60)
-#define EL_CHAR_GLEICH         (EL_CHAR_ASCII0+61)
-#define EL_CHAR_GT             (EL_CHAR_ASCII0+62)
-#define EL_CHAR_FRAGE          (EL_CHAR_ASCII0+63)
-#define EL_CHAR_AT             (EL_CHAR_ASCII0+64)
-#define EL_CHAR_A              (EL_CHAR_ASCII0+65)
-#define EL_CHAR_Z              (EL_CHAR_ASCII0+90)
-#define EL_CHAR_AE             (EL_CHAR_ASCII0+91)
-#define EL_CHAR_OE             (EL_CHAR_ASCII0+92)
-#define EL_CHAR_UE             (EL_CHAR_ASCII0+93)
-#define EL_CHAR_COPY           (EL_CHAR_ASCII0+94)
-#define EL_CHAR_END            (EL_CHAR_START+79)
-
-#define EL_CHAR(x)             ((x) == 'Ä' ? EL_CHAR_AE : \
-                                (x) == 'Ö' ? EL_CHAR_OE : \
-                                (x) == 'Ü' ? EL_CHAR_UE : \
-                                EL_CHAR_A + (x) - 'A')
-
-#define EL_MAUER_X             200
-#define EL_MAUER_Y             201
-#define EL_MAUER_XY            202
-
-#define EL_EM_GATE1            203
-#define EL_EM_GATE2            204
-#define EL_EM_GATE3            205
-#define EL_EM_GATE4            206
-
-#define EL_EM_KEY2_FILE                207
-#define EL_EM_KEY3_FILE                208
-#define EL_EM_KEY4_FILE                209
-
-#define EL_SP_START            210
-#define EL_SP_EMPTY            (EL_SP_START + 0)
-#define EL_SP_ZONK             (EL_SP_START + 1)
-#define EL_SP_BASE             (EL_SP_START + 2)
-#define EL_SP_MURPHY           (EL_SP_START + 3)
-#define EL_SP_INFOTRON         (EL_SP_START + 4)
-#define EL_SP_CHIP_SINGLE      (EL_SP_START + 5)
-#define EL_SP_HARD_GRAY                (EL_SP_START + 6)
-#define EL_SP_EXIT             (EL_SP_START + 7)
-#define EL_SP_DISK_ORANGE      (EL_SP_START + 8)
-#define EL_SP_PORT1_RIGHT      (EL_SP_START + 9)
-#define EL_SP_PORT1_DOWN       (EL_SP_START + 10)
-#define EL_SP_PORT1_LEFT       (EL_SP_START + 11)
-#define EL_SP_PORT1_UP         (EL_SP_START + 12)
-#define EL_SP_PORT2_RIGHT      (EL_SP_START + 13)
-#define EL_SP_PORT2_DOWN       (EL_SP_START + 14)
-#define EL_SP_PORT2_LEFT       (EL_SP_START + 15)
-#define EL_SP_PORT2_UP         (EL_SP_START + 16)
-#define EL_SP_SNIKSNAK         (EL_SP_START + 17)
-#define EL_SP_DISK_YELLOW      (EL_SP_START + 18)
-#define EL_SP_TERMINAL         (EL_SP_START + 19)
-#define EL_SP_DISK_RED         (EL_SP_START + 20)
-#define EL_SP_PORT_Y           (EL_SP_START + 21)
-#define EL_SP_PORT_X           (EL_SP_START + 22)
-#define EL_SP_PORT_XY          (EL_SP_START + 23)
-#define EL_SP_ELECTRON         (EL_SP_START + 24)
-#define EL_SP_BUG              (EL_SP_START + 25)
-#define EL_SP_CHIP_LEFT                (EL_SP_START + 26)
-#define EL_SP_CHIP_RIGHT       (EL_SP_START + 27)
-#define EL_SP_HARD_BASE1       (EL_SP_START + 28)
-#define EL_SP_HARD_GREEN       (EL_SP_START + 29)
-#define EL_SP_HARD_BLUE                (EL_SP_START + 30)
-#define EL_SP_HARD_RED         (EL_SP_START + 31)
-#define EL_SP_HARD_YELLOW      (EL_SP_START + 32)
-#define EL_SP_HARD_BASE2       (EL_SP_START + 33)
-#define EL_SP_HARD_BASE3       (EL_SP_START + 34)
-#define EL_SP_HARD_BASE4       (EL_SP_START + 35)
-#define EL_SP_HARD_BASE5       (EL_SP_START + 36)
-#define EL_SP_HARD_BASE6       (EL_SP_START + 37)
-#define EL_SP_CHIP_UPPER       (EL_SP_START + 38)
-#define EL_SP_CHIP_LOWER       (EL_SP_START + 39)
-#define EL_SP_END              (EL_SP_START + 39)
-
-#define EL_EM_GATE1_GRAY       250
-#define EL_EM_GATE2_GRAY       251
-#define EL_EM_GATE3_GRAY       252
-#define EL_EM_GATE4_GRAY       253
-
-#define EL_UNUSED_254          254
-#define EL_UNUSED_255          255
-
-#define EL_PEARL               256
-#define EL_CRYSTAL             257
-#define EL_WALL_PEARL          258
-#define EL_WALL_CRYSTAL                259
-#define EL_DOOR_WHITE          260
-#define EL_DOOR_WHITE_GRAY     261
-#define EL_KEY_WHITE           262
-#define EL_SHIELD_PASSIVE      263
-#define EL_EXTRA_TIME          264
-#define EL_SWITCHGATE_OPEN     265
-#define EL_SWITCHGATE_CLOSED   266
-#define EL_SWITCHGATE_SWITCH_1 267
-#define EL_SWITCHGATE_SWITCH_2 268
-
-#define EL_UNUSED_269          269
-#define EL_UNUSED_270          270
-
-#define EL_BELT1_LEFT          271
-#define EL_BELT1_MIDDLE                272
-#define EL_BELT1_RIGHT         273
-#define EL_BELT1_SWITCH_LEFT   274
-#define EL_BELT1_SWITCH_MIDDLE 275
-#define EL_BELT1_SWITCH_RIGHT  276
-#define EL_BELT2_LEFT          277
-#define EL_BELT2_MIDDLE                278
-#define EL_BELT2_RIGHT         279
-#define EL_BELT2_SWITCH_LEFT   280
-#define EL_BELT2_SWITCH_MIDDLE 281
-#define EL_BELT2_SWITCH_RIGHT  282
-#define EL_BELT3_LEFT          283
-#define EL_BELT3_MIDDLE                284
-#define EL_BELT3_RIGHT         285
-#define EL_BELT3_SWITCH_LEFT   286
-#define EL_BELT3_SWITCH_MIDDLE 287
-#define EL_BELT3_SWITCH_RIGHT  288
-#define EL_BELT4_LEFT          289
-#define EL_BELT4_MIDDLE                290
-#define EL_BELT4_RIGHT         291
-#define EL_BELT4_SWITCH_LEFT   292
-#define EL_BELT4_SWITCH_MIDDLE 293
-#define EL_BELT4_SWITCH_RIGHT  294
-#define EL_LANDMINE            295
-#define EL_ENVELOPE            296
-#define EL_LIGHT_SWITCH_OFF    297
-#define EL_LIGHT_SWITCH_ON     298
-#define EL_SIGN_EXCLAMATION    299
-#define EL_SIGN_RADIOACTIVITY  300
-#define EL_SIGN_STOP           301
-#define EL_SIGN_WHEELCHAIR     302
-#define EL_SIGN_PARKING                303
-#define EL_SIGN_ONEWAY         304
-#define EL_SIGN_HEART          305
-#define EL_SIGN_TRIANGLE       306
-#define EL_SIGN_ROUND          307
-#define EL_SIGN_EXIT           308
-#define EL_SIGN_YINYANG                309
-#define EL_SIGN_OTHER          310
-#define EL_MOLE_LEFT           311
-#define EL_MOLE_RIGHT          312
-#define EL_MOLE_UP             313
-#define EL_MOLE_DOWN           314
-#define EL_STEEL_SLANTED       315
-#define EL_SAND_INVISIBLE      316
-#define EL_DX_UNKNOWN_15       317
-#define EL_DX_UNKNOWN_42       318
-
-#define EL_UNUSED_319          319
-#define EL_UNUSED_320          320
-
-#define EL_SHIELD_ACTIVE       321
-#define EL_TIMEGATE_OPEN       322
-#define EL_TIMEGATE_CLOSED     323
-#define EL_TIMEGATE_SWITCH_ON  324
-#define EL_TIMEGATE_SWITCH_OFF 325
-
-#define EL_BALLOON             326
-#define EL_BALLOON_SEND_LEFT   327
-#define EL_BALLOON_SEND_RIGHT  328
-#define EL_BALLOON_SEND_UP     329
-#define EL_BALLOON_SEND_DOWN   330
-#define EL_BALLOON_SEND_ANY    331
-
-#define EL_EMC_STEEL_WALL_1    332
-#define EL_EMC_STEEL_WALL_2    333
-#define EL_EMC_STEEL_WALL_3    334
-#define EL_EMC_STEEL_WALL_4    335
-#define EL_EMC_WALL_1          336
-#define EL_EMC_WALL_2          337
-#define EL_EMC_WALL_3          338
-#define EL_EMC_WALL_4          339
-#define EL_EMC_WALL_5          340
-#define EL_EMC_WALL_6          341
-#define EL_EMC_WALL_7          342
-#define EL_EMC_WALL_8          343
-
-#define EL_TUBE_CROSS          344
-#define EL_TUBE_VERTICAL       345
-#define EL_TUBE_HORIZONTAL     346
-#define EL_TUBE_VERT_LEFT      347
-#define EL_TUBE_VERT_RIGHT     348
-#define EL_TUBE_HORIZ_UP       349
-#define EL_TUBE_HORIZ_DOWN     350
-#define EL_TUBE_LEFT_UP                351
-#define EL_TUBE_LEFT_DOWN      352
-#define EL_TUBE_RIGHT_UP       353
-#define EL_TUBE_RIGHT_DOWN     354
-#define EL_SPRING              355
-#define EL_TRAP_INACTIVE       356
-#define EL_DX_SUPABOMB         357
-
-#define NUM_FILE_ELEMENTS      358
+#define EL_EMPTY_SPACE                 0
+#define EL_EMPTY                       EL_EMPTY_SPACE
+#define        EL_SAND                         1
+#define        EL_WALL                         2
+#define        EL_WALL_CRUMBLED                3
+#define        EL_ROCK                         4
+#define        EL_KEY                          5
+#define        EL_EMERALD                      6
+#define        EL_EXIT_CLOSED                  7
+#define        EL_PLAYER                       8
+#define EL_BUG                         9
+#define EL_SPACESHIP                   10
+#define EL_YAMYAM                      11
+#define EL_ROBOT                       12
+#define EL_STEELWALL                   13
+#define EL_DIAMOND                     14
+#define EL_AMOEBA_DEAD                 15
+#define EL_QUICKSAND_EMPTY             16
+#define EL_QUICKSAND_FULL              17
+#define EL_AMOEBA_DROP                 18
+#define EL_BOMB                                19
+#define EL_MAGIC_WALL                  20
+#define EL_SPEED_PILL                  21
+#define EL_ACID                                22
+#define EL_AMOEBA_WET                  23
+#define EL_AMOEBA_DRY                  24
+#define EL_NUT                         25
+#define EL_GAMEOFLIFE                  26
+#define EL_BIOMAZE                     27
+#define EL_DYNAMITE_ACTIVE             28
+#define EL_STONEBLOCK                  29
+#define EL_ROBOT_WHEEL                 30
+#define EL_ROBOT_WHEEL_ACTIVE          31
+#define EL_KEY1                                32
+#define EL_KEY2                                33
+#define EL_KEY3                                34
+#define EL_KEY4                                35
+#define EL_GATE1                       36
+#define EL_GATE2                       37
+#define EL_GATE3                       38
+#define EL_GATE4                       39
+#define EL_GATE1_GRAY                  40
+#define EL_GATE2_GRAY                  41
+#define EL_GATE3_GRAY                  42
+#define EL_GATE4_GRAY                  43
+#define EL_DYNAMITE                    44
+#define EL_PACMAN                      45
+#define EL_INVISIBLE_WALL              46
+#define EL_LAMP                                47
+#define EL_LAMP_ACTIVE                 48
+#define EL_WALL_EMERALD                        49
+#define EL_WALL_DIAMOND                        50
+#define EL_AMOEBA_FULL                 51
+#define EL_BD_AMOEBA                   52
+#define EL_TIME_ORB_FULL               53
+#define EL_TIME_ORB_EMPTY              54
+#define EL_WALL_GROWING                        55
+#define EL_BD_DIAMOND                  56
+#define EL_EMERALD_YELLOW              57
+#define EL_WALL_BD_DIAMOND             58
+#define EL_WALL_EMERALD_YELLOW         59
+#define EL_DARK_YAMYAM                 60
+#define EL_MAGIC_WALL_BD_OFF           61
+#define EL_INVISIBLE_STEELWALL         62
+
+#define EL_UNUSED_63                   63
+
+#define EL_DYNABOMB_NR                 64
+#define EL_DYNABOMB_SZ                 65
+#define EL_DYNABOMB_XL                 66
+#define EL_SOKOBAN_OBJEKT              67
+#define EL_SOKOBAN_FELD_LEER           68
+#define EL_SOKOBAN_FELD_VOLL           69
+#define EL_BUTTERFLY_RIGHT             70
+#define EL_BUTTERFLY_UP                        71
+#define EL_BUTTERFLY_LEFT              72
+#define EL_BUTTERFLY_DOWN              73
+#define EL_FIREFLY_RIGHT               74
+#define EL_FIREFLY_UP                  75
+#define EL_FIREFLY_LEFT                        76
+#define EL_FIREFLY_DOWN                        77
+#define EL_BUTTERFLY_1                 EL_BUTTERFLY_DOWN
+#define EL_BUTTERFLY_2                 EL_BUTTERFLY_LEFT
+#define EL_BUTTERFLY_3                 EL_BUTTERFLY_UP
+#define EL_BUTTERFLY_4                 EL_BUTTERFLY_RIGHT
+#define EL_FIREFLY_1                   EL_FIREFLY_LEFT
+#define EL_FIREFLY_2                   EL_FIREFLY_DOWN
+#define EL_FIREFLY_3                   EL_FIREFLY_RIGHT
+#define EL_FIREFLY_4                   EL_FIREFLY_UP
+#define EL_BUTTERFLY                   78
+#define EL_FIREFLY                     79
+#define EL_PLAYER1                     80
+#define EL_PLAYER2                     81
+#define EL_PLAYER3                     82
+#define EL_PLAYER4                     83
+#define EL_BUG_RIGHT                   84
+#define EL_BUG_UP                      85
+#define EL_BUG_LEFT                    86
+#define EL_BUG_DOWN                    87
+#define EL_SPACESHIP_RIGHT             88
+#define EL_SPACESHIP_UP                        89
+#define EL_SPACESHIP_LEFT              90
+#define EL_SPACESHIP_DOWN              91
+#define EL_PACMAN_RIGHT                        92
+#define EL_PACMAN_UP                   93
+#define EL_PACMAN_LEFT                 94
+#define EL_PACMAN_DOWN                 95
+#define EL_EMERALD_RED                 96
+#define EL_EMERALD_PURPLE              97
+#define EL_WALL_EMERALD_RED            98
+#define EL_WALL_EMERALD_PURPLE         99
+#define EL_ACIDPOOL_TOPLEFT            100
+#define EL_ACIDPOOL_TOPRIGHT           101
+#define EL_ACIDPOOL_BOTTOMLEFT         102
+#define EL_ACIDPOOL_BOTTOM             103
+#define EL_ACIDPOOL_BOTTOMRIGHT                104
+#define EL_BD_WALL                     105
+#define EL_BD_ROCK                     106
+#define EL_EXIT_OPEN                   107
+#define EL_BLACK_ORB                   108
+#define EL_AMOEBA_TO_DIAMOND           109
+#define EL_MOLE                                110
+#define EL_PENGUIN                     111
+#define EL_SATELLITE                   112
+#define EL_ARROW_LEFT                  113
+#define EL_ARROW_RIGHT                 114
+#define EL_ARROW_UP                    115
+#define EL_ARROW_DOWN                  116
+#define EL_PIG                         117
+#define EL_DRAGON                      118
+
+#define EL_EM_KEY1_FILE                        119
+
+#define EL_CHAR_START                  120
+#define EL_CHAR_ASCII0                 (EL_CHAR_START-32)
+#define EL_CHAR_EXCLAM                 (EL_CHAR_ASCII0+33)
+#define EL_CHAR_QUOTEDBL               (EL_CHAR_ASCII0+34)
+#define EL_CHAR_NUMBERSIGN             (EL_CHAR_ASCII0+35)
+#define EL_CHAR_DOLLAR                 (EL_CHAR_ASCII0+36)
+#define EL_CHAR_PROCENT                        (EL_CHAR_ASCII0+37)
+#define EL_CHAR_AMPERSAND              (EL_CHAR_ASCII0+38)
+#define EL_CHAR_APOSTROPHE             (EL_CHAR_ASCII0+39)
+#define EL_CHAR_PARENLEFT              (EL_CHAR_ASCII0+40)
+#define EL_CHAR_PARENRIGHT             (EL_CHAR_ASCII0+41)
+#define EL_CHAR_ASTERISK               (EL_CHAR_ASCII0+42)
+#define EL_CHAR_PLUS                   (EL_CHAR_ASCII0+43)
+#define EL_CHAR_COMMA                  (EL_CHAR_ASCII0+44)
+#define EL_CHAR_MINUS                  (EL_CHAR_ASCII0+45)
+#define EL_CHAR_PERIOD                 (EL_CHAR_ASCII0+46)
+#define EL_CHAR_SLASH                  (EL_CHAR_ASCII0+47)
+#define EL_CHAR_0                      (EL_CHAR_ASCII0+48)
+#define EL_CHAR_9                      (EL_CHAR_ASCII0+57)
+#define EL_CHAR_COLON                  (EL_CHAR_ASCII0+58)
+#define EL_CHAR_SEMICOLON              (EL_CHAR_ASCII0+59)
+#define EL_CHAR_LESS                   (EL_CHAR_ASCII0+60)
+#define EL_CHAR_EQUAL                  (EL_CHAR_ASCII0+61)
+#define EL_CHAR_GREATER                        (EL_CHAR_ASCII0+62)
+#define EL_CHAR_QUESTION               (EL_CHAR_ASCII0+63)
+#define EL_CHAR_AT                     (EL_CHAR_ASCII0+64)
+#define EL_CHAR_A                      (EL_CHAR_ASCII0+65)
+#define EL_CHAR_Z                      (EL_CHAR_ASCII0+90)
+#define EL_CHAR_AE                     (EL_CHAR_ASCII0+91)
+#define EL_CHAR_OE                     (EL_CHAR_ASCII0+92)
+#define EL_CHAR_UE                     (EL_CHAR_ASCII0+93)
+#define EL_CHAR_COPYRIGHT              (EL_CHAR_ASCII0+94)
+#define EL_CHAR_END                    (EL_CHAR_START+79)
+
+#define EL_CHAR(x)                     ((x) == 'Ä' ? EL_CHAR_AE : \
+                                        (x) == 'Ö' ? EL_CHAR_OE : \
+                                        (x) == 'Ü' ? EL_CHAR_UE : \
+                                        EL_CHAR_A + (x) - 'A')
+
+#define EL_WALL_GROWING_X              200
+#define EL_WALL_GROWING_Y              201
+#define EL_WALL_GROWING_XY             202
+
+#define EL_EM_GATE1                    203
+#define EL_EM_GATE2                    204
+#define EL_EM_GATE3                    205
+#define EL_EM_GATE4                    206
+
+#define EL_EM_KEY2_FILE                        207
+#define EL_EM_KEY3_FILE                        208
+#define EL_EM_KEY4_FILE                        209
+
+#define EL_SP_START                    210
+#define EL_SP_EMPTY_SPACE              (EL_SP_START + 0)
+#define EL_SP_EMPTY                    EL_SP_EMPTY_SPACE
+#define EL_SP_ZONK                     (EL_SP_START + 1)
+#define EL_SP_BASE                     (EL_SP_START + 2)
+#define EL_SP_MURPHY                   (EL_SP_START + 3)
+#define EL_SP_INFOTRON                 (EL_SP_START + 4)
+#define EL_SP_CHIP_SINGLE              (EL_SP_START + 5)
+#define EL_SP_HARD_GRAY                        (EL_SP_START + 6)
+#define EL_SP_EXIT_CLOSED              (EL_SP_START + 7)
+#define EL_SP_DISK_ORANGE              (EL_SP_START + 8)
+#define EL_SP_PORT1_RIGHT              (EL_SP_START + 9)
+#define EL_SP_PORT1_DOWN               (EL_SP_START + 10)
+#define EL_SP_PORT1_LEFT               (EL_SP_START + 11)
+#define EL_SP_PORT1_UP                 (EL_SP_START + 12)
+#define EL_SP_PORT2_RIGHT              (EL_SP_START + 13)
+#define EL_SP_PORT2_DOWN               (EL_SP_START + 14)
+#define EL_SP_PORT2_LEFT               (EL_SP_START + 15)
+#define EL_SP_PORT2_UP                 (EL_SP_START + 16)
+#define EL_SP_SNIKSNAK                 (EL_SP_START + 17)
+#define EL_SP_DISK_YELLOW              (EL_SP_START + 18)
+#define EL_SP_TERMINAL                 (EL_SP_START + 19)
+#define EL_SP_DISK_RED                 (EL_SP_START + 20)
+#define EL_SP_PORT_Y                   (EL_SP_START + 21)
+#define EL_SP_PORT_X                   (EL_SP_START + 22)
+#define EL_SP_PORT_XY                  (EL_SP_START + 23)
+#define EL_SP_ELECTRON                 (EL_SP_START + 24)
+#define EL_SP_BUG                      (EL_SP_START + 25)
+#define EL_SP_CHIP_LEFT                        (EL_SP_START + 26)
+#define EL_SP_CHIP_RIGHT               (EL_SP_START + 27)
+#define EL_SP_HARD_BASE1               (EL_SP_START + 28)
+#define EL_SP_HARD_GREEN               (EL_SP_START + 29)
+#define EL_SP_HARD_BLUE                        (EL_SP_START + 30)
+#define EL_SP_HARD_RED                 (EL_SP_START + 31)
+#define EL_SP_HARD_YELLOW              (EL_SP_START + 32)
+#define EL_SP_HARD_BASE2               (EL_SP_START + 33)
+#define EL_SP_HARD_BASE3               (EL_SP_START + 34)
+#define EL_SP_HARD_BASE4               (EL_SP_START + 35)
+#define EL_SP_HARD_BASE5               (EL_SP_START + 36)
+#define EL_SP_HARD_BASE6               (EL_SP_START + 37)
+#define EL_SP_CHIP_UPPER               (EL_SP_START + 38)
+#define EL_SP_CHIP_LOWER               (EL_SP_START + 39)
+#define EL_SP_END                      (EL_SP_START + 39)
+
+#define EL_EM_GATE1_GRAY               250
+#define EL_EM_GATE2_GRAY               251
+#define EL_EM_GATE3_GRAY               252
+#define EL_EM_GATE4_GRAY               253
+
+#define EL_UNUSED_254                  254
+#define EL_UNUSED_255                  255
+
+#define EL_PEARL                       256
+#define EL_CRYSTAL                     257
+#define EL_WALL_PEARL                  258
+#define EL_WALL_CRYSTAL                        259
+#define EL_DOOR_WHITE                  260
+#define EL_DOOR_WHITE_GRAY             261
+#define EL_KEY_WHITE                   262
+#define EL_SHIELD_NORMAL               263
+#define EL_EXTRA_TIME                  264
+#define EL_SWITCHGATE_OPEN             265
+#define EL_SWITCHGATE_CLOSED           266
+#define EL_SWITCHGATE_SWITCH_UP                267
+#define EL_SWITCHGATE_SWITCH_DOWN      268
+
+#define EL_UNUSED_269                  269
+#define EL_UNUSED_270                  270
+
+#define EL_CONVEYOR_BELT1_LEFT         271
+#define EL_CONVEYOR_BELT1_MIDDLE       272
+#define EL_CONVEYOR_BELT1_RIGHT                273
+#define EL_CONVEYOR_BELT1_SWITCH_LEFT  274
+#define EL_CONVEYOR_BELT1_SWITCH_MIDDLE        275
+#define EL_CONVEYOR_BELT1_SWITCH_RIGHT 276
+#define EL_CONVEYOR_BELT2_LEFT         277
+#define EL_CONVEYOR_BELT2_MIDDLE       278
+#define EL_CONVEYOR_BELT2_RIGHT                279
+#define EL_CONVEYOR_BELT2_SWITCH_LEFT  280
+#define EL_CONVEYOR_BELT2_SWITCH_MIDDLE        281
+#define EL_CONVEYOR_BELT2_SWITCH_RIGHT 282
+#define EL_CONVEYOR_BELT3_LEFT         283
+#define EL_CONVEYOR_BELT3_MIDDLE       284
+#define EL_CONVEYOR_BELT3_RIGHT                285
+#define EL_CONVEYOR_BELT3_SWITCH_LEFT  286
+#define EL_CONVEYOR_BELT3_SWITCH_MIDDLE        287
+#define EL_CONVEYOR_BELT3_SWITCH_RIGHT 288
+#define EL_CONVEYOR_BELT4_LEFT         289
+#define EL_CONVEYOR_BELT4_MIDDLE       290
+#define EL_CONVEYOR_BELT4_RIGHT                291
+#define EL_CONVEYOR_BELT4_SWITCH_LEFT  292
+#define EL_CONVEYOR_BELT4_SWITCH_MIDDLE        293
+#define EL_CONVEYOR_BELT4_SWITCH_RIGHT 294
+#define EL_LANDMINE                    295
+#define EL_ENVELOPE                    296
+#define EL_LIGHT_SWITCH                        297
+#define EL_LIGHT_SWITCH_ACTIVE         298
+#define EL_SIGN_EXCLAMATION            299
+#define EL_SIGN_RADIOACTIVITY          300
+#define EL_SIGN_STOP                   301
+#define EL_SIGN_WHEELCHAIR             302
+#define EL_SIGN_PARKING                        303
+#define EL_SIGN_ONEWAY                 304
+#define EL_SIGN_HEART                  305
+#define EL_SIGN_TRIANGLE               306
+#define EL_SIGN_ROUND                  307
+#define EL_SIGN_EXIT                   308
+#define EL_SIGN_YINYANG                        309
+#define EL_SIGN_OTHER                  310
+#define EL_MOLE_LEFT                   311
+#define EL_MOLE_RIGHT                  312
+#define EL_MOLE_UP                     313
+#define EL_MOLE_DOWN                   314
+#define EL_STEELWALL_SLANTED           315
+#define EL_SAND_INVISIBLE              316
+#define EL_DX_UNKNOWN_15               317
+#define EL_DX_UNKNOWN_42               318
+
+#define EL_UNUSED_319                  319
+#define EL_UNUSED_320                  320
+
+#define EL_SHIELD_ACTIVE               321
+#define EL_TIMEGATE_OPEN               322
+#define EL_TIMEGATE_CLOSED             323
+#define EL_TIMEGATE_SWITCH_ON          324
+#define EL_TIMEGATE_SWITCH_OFF         325
+
+#define EL_BALLOON                     326
+#define EL_BALLOON_SEND_LEFT           327
+#define EL_BALLOON_SEND_RIGHT          328
+#define EL_BALLOON_SEND_UP             329
+#define EL_BALLOON_SEND_DOWN           330
+#define EL_BALLOON_SEND_ANY            331
+
+#define EL_EMC_STEELWALL1              332
+#define EL_EMC_STEELWALL2              333
+#define EL_EMC_STEELWALL3              334
+#define EL_EMC_STEELWALL4              335
+#define EL_EMC_WALL_PILLAR_UPPER       336
+#define EL_EMC_WALL_PILLAR_MIDDLE      337
+#define EL_EMC_WALL_PILLAR_LOWER       338
+#define EL_EMC_WALL4                   339
+#define EL_EMC_WALL5                   340
+#define EL_EMC_WALL6                   341
+#define EL_EMC_WALL7                   342
+#define EL_EMC_WALL8                   343
+
+#define EL_TUBE_CROSS                  344
+#define EL_TUBE_VERTICAL               345
+#define EL_TUBE_HORIZONTAL             346
+#define EL_TUBE_VERT_LEFT              347
+#define EL_TUBE_VERT_RIGHT             348
+#define EL_TUBE_HORIZ_UP               349
+#define EL_TUBE_HORIZ_DOWN             350
+#define EL_TUBE_LEFT_UP                        351
+#define EL_TUBE_LEFT_DOWN              352
+#define EL_TUBE_RIGHT_UP               353
+#define EL_TUBE_RIGHT_DOWN             354
+#define EL_SPRING                      355
+#define EL_TRAP_INACTIVE               356
+#define EL_DX_SUPABOMB                 357
+
+#define NUM_FILE_ELEMENTS              358
 
 
 /* "real" (and therefore drawable) runtime elements */
 #define EL_AUSGANG_ACT                 (EL_FIRST_RUNTIME + 6)
 #define EL_SP_TERMINAL_ACTIVE          (EL_FIRST_RUNTIME + 7)
 #define EL_SP_BUG_ACTIVE               (EL_FIRST_RUNTIME + 8)
-#define EL_EM_KEY_1                    (EL_FIRST_RUNTIME + 9)
-#define EL_EM_KEY_2                    (EL_FIRST_RUNTIME + 10)
-#define EL_EM_KEY_3                    (EL_FIRST_RUNTIME + 11)
-#define EL_EM_KEY_4                    (EL_FIRST_RUNTIME + 12)
+#define EL_EM_KEY                    (EL_FIRST_RUNTIME + 9)
+#define EL_EM_KEY                    (EL_FIRST_RUNTIME + 10)
+#define EL_EM_KEY                    (EL_FIRST_RUNTIME + 11)
+#define EL_EM_KEY                    (EL_FIRST_RUNTIME + 12)
 #define EL_DYNABOMB_ACTIVE_1           (EL_FIRST_RUNTIME + 13)
 #define EL_DYNABOMB_ACTIVE_2           (EL_FIRST_RUNTIME + 14)
 #define EL_DYNABOMB_ACTIVE_3           (EL_FIRST_RUNTIME + 15)
 **     1280 - 1535: graphics from "RocksMore"
 */
 
-#define GFX_START_ROCKSELEMENTS        0
-#define GFX_END_ROCKSELEMENTS  255
-#define GFX_START_ROCKSFONT    256
-#define GFX_END_ROCKSFONT      511
-#define GFX_START_ROCKSHEROES  512
-#define GFX_END_ROCKSHEROES    767
-#define GFX_START_ROCKSSP      768
-#define GFX_END_ROCKSSP                1023
-#define GFX_START_ROCKSDC      1024
-#define GFX_END_ROCKSDC                1279
-#define GFX_START_ROCKSMORE    1280
-#define GFX_END_ROCKSMORE      1535
-
-#define NUM_TILES              1536            /* see above: MAX_GRAPHICS */
+#define GFX_START_ROCKSELEMENTS                0
+#define GFX_END_ROCKSELEMENTS          255
+#define GFX_START_ROCKSFONT            256
+#define GFX_END_ROCKSFONT              511
+#define GFX_START_ROCKSHEROES          512
+#define GFX_END_ROCKSHEROES            767
+#define GFX_START_ROCKSSP              768
+#define GFX_END_ROCKSSP                        1023
+#define GFX_START_ROCKSDC              1024
+#define GFX_END_ROCKSDC                        1279
+#define GFX_START_ROCKSMORE            1280
+#define GFX_END_ROCKSMORE              1535
+
+#define NUM_TILES                      1536    /* see above: MAX_GRAPHICS */
 
 /* graphics from "RocksScreen" */
 /* Zeile 0 (0) */
-#define GFX_LEERRAUM           (-1)
-#define        GFX_ERDREICH            0
-#define GFX_ERDENRAND          1
-#define GFX_MORAST_LEER                2
-#define GFX_MORAST_VOLL                3
-#define GFX_BETON              4
-#define        GFX_MAUERWERK           5
-#define        GFX_FELSBODEN           6
-#define        GFX_EDELSTEIN           8
-#define GFX_DIAMANT            10
-#define        GFX_FELSBROCKEN         12
+#define GFX_LEERRAUM                   (-1)
+#define        GFX_ERDREICH                    0
+#define GFX_ERDENRAND                  1
+#define GFX_MORAST_LEER                        2
+#define GFX_MORAST_VOLL                        3
+#define GFX_BETON                      4
+#define        GFX_MAUERWERK                   5
+#define        GFX_FELSBODEN                   6
+#define        GFX_EDELSTEIN                   8
+#define GFX_DIAMANT                    10
+#define        GFX_FELSBROCKEN                 12
 /* Zeile 1 (16) */
-#define GFX_BADEWANNE1         16
-#define GFX_SALZSAEURE         17
-#define GFX_BADEWANNE2         18
+#define GFX_BADEWANNE1                 16
+#define GFX_SALZSAEURE                 17
+#define GFX_BADEWANNE2                 18
 
 /*
-#define GFX_UNSICHTBAR         19
+#define GFX_UNSICHTBAR                 19
 */
 
-#define GFX_SCHLUESSEL1                20
-#define GFX_SCHLUESSEL2                21
-#define GFX_SCHLUESSEL3                22
-#define GFX_SCHLUESSEL4                23
-#define GFX_LIFE               24
-#define GFX_LIFE_ASYNC         25
-#define GFX_BADEWANNE          26
-#define GFX_BOMBE              27
-#define GFX_KOKOSNUSS          28
-#define GFX_CRACKINGNUT                29
+#define GFX_SCHLUESSEL1                        20
+#define GFX_SCHLUESSEL2                        21
+#define GFX_SCHLUESSEL3                        22
+#define GFX_SCHLUESSEL4                        23
+#define GFX_LIFE                       24
+#define GFX_LIFE_ASYNC                 25
+#define GFX_BADEWANNE                  26
+#define GFX_BOMBE                      27
+#define GFX_KOKOSNUSS                  28
+#define GFX_CRACKINGNUT                        29
 /* Zeile 2 (32) */
-#define GFX_BADEWANNE3         32
-#define GFX_BADEWANNE4         33
-#define GFX_BADEWANNE5         34
-#define        GFX_SMILEY              35
-#define GFX_PFORTE1            36
-#define GFX_PFORTE2            37
-#define GFX_PFORTE3            38
-#define GFX_PFORTE4            39
-#define GFX_PFORTE1X           40
-#define GFX_PFORTE2X           41
-#define GFX_PFORTE3X           42
-#define GFX_PFORTE4X           43
+#define GFX_BADEWANNE3                 32
+#define GFX_BADEWANNE4                 33
+#define GFX_BADEWANNE5                 34
+#define        GFX_SMILEY                      35
+#define GFX_PFORTE1                    36
+#define GFX_PFORTE2                    37
+#define GFX_PFORTE3                    38
+#define GFX_PFORTE4                    39
+#define GFX_PFORTE1X                   40
+#define GFX_PFORTE2X                   41
+#define GFX_PFORTE3X                   42
+#define GFX_PFORTE4X                   43
 /* Zeile 3 (48) */
-#define GFX_DYNAMIT_AUS                48
-#define GFX_DYNAMIT            49
-#define GFX_FLIEGER            56
-#define GFX_FLIEGER_RIGHT      56
-#define GFX_FLIEGER_UP         58
-#define GFX_FLIEGER_LEFT       60
-#define GFX_FLIEGER_DOWN       62
+#define GFX_DYNAMIT_AUS                        48
+#define GFX_DYNAMIT                    49
+#define GFX_FLIEGER                    56
+#define GFX_FLIEGER_RIGHT              56
+#define GFX_FLIEGER_UP                 58
+#define GFX_FLIEGER_LEFT               60
+#define GFX_FLIEGER_DOWN               62
 /* Zeile 4 (64) */
-#define GFX_EXPLOSION          64
-#define GFX_KAEFER             72
-#define GFX_KAEFER_RIGHT       72
-#define GFX_KAEFER_UP          74
-#define GFX_KAEFER_LEFT                76
-#define GFX_KAEFER_DOWN                78
+#define GFX_EXPLOSION                  64
+#define GFX_KAEFER                     72
+#define GFX_KAEFER_RIGHT               72
+#define GFX_KAEFER_UP                  74
+#define GFX_KAEFER_LEFT                        76
+#define GFX_KAEFER_DOWN                        78
 /* Zeile 5 (80) */
-#define GFX_MAMPFER            80
-#define GFX_ROBOT              84
-#define GFX_PACMAN             88
-#define GFX_PACMAN_RIGHT       88
-#define GFX_PACMAN_UP          90
-#define GFX_PACMAN_LEFT                92
-#define GFX_PACMAN_DOWN                94
+#define GFX_MAMPFER                    80
+#define GFX_ROBOT                      84
+#define GFX_PACMAN                     88
+#define GFX_PACMAN_RIGHT               88
+#define GFX_PACMAN_UP                  90
+#define GFX_PACMAN_LEFT                        92
+#define GFX_PACMAN_DOWN                        94
 /* Zeile 6 (96) */
-#define GFX_ABLENK             96
-#define GFX_ABLENK_EIN         GFX_ABLENK
-#define GFX_ABLENK_AUS         GFX_ABLENK
-#define GFX_AMOEBE_NASS                100
-#define GFX_TROPFEN            101
-#define GFX_AMOEBING           GFX_TROPFEN
-#define GFX_AMOEBE_LEBT                104
-#define GFX_AMOEBE_NORM                GFX_AMOEBE_LEBT
-#define GFX_AMOEBE_TOT         108
-#define GFX_AMOEBA2DIAM                GFX_AMOEBE_TOT
+#define GFX_ABLENK                     96
+#define GFX_ABLENK_EIN                 GFX_ABLENK
+#define GFX_ABLENK_AUS                 GFX_ABLENK
+#define GFX_AMOEBE_NASS                        100
+#define GFX_TROPFEN                    101
+#define GFX_AMOEBING                   GFX_TROPFEN
+#define GFX_AMOEBE_LEBT                        104
+#define GFX_AMOEBE_NORM                        GFX_AMOEBE_LEBT
+#define GFX_AMOEBE_TOT                 108
+#define GFX_AMOEBA2DIAM                        GFX_AMOEBE_TOT
 /* Zeile 7 (112) */
-#define GFX_BIRNE_AUS          112
-#define GFX_BIRNE_EIN          113
-#define GFX_ZEIT_VOLL          114
-#define GFX_ZEIT_LEER          115
-#define GFX_SPIELER1           116
-#define GFX_SPIELER2           117
-#define GFX_SPIELER3           118
-#define GFX_SPIELER4           119
-#define GFX_AMOEBE_VOLL                120
-#define GFX_AMOEBE_BD          GFX_AMOEBE_VOLL
-#define GFX_SOKOBAN_OBJEKT     121
-#define GFX_SOKOBAN_FELD_LEER  122
-#define GFX_SOKOBAN_FELD_VOLL  123
-#define GFX_GEBLUBBER          124
+#define GFX_BIRNE_AUS                  112
+#define GFX_BIRNE_EIN                  113
+#define GFX_ZEIT_VOLL                  114
+#define GFX_ZEIT_LEER                  115
+#define GFX_SPIELER1                   116
+#define GFX_SPIELER2                   117
+#define GFX_SPIELER3                   118
+#define GFX_SPIELER4                   119
+#define GFX_AMOEBE_VOLL                        120
+#define GFX_AMOEBE_BD                  GFX_AMOEBE_VOLL
+#define GFX_SOKOBAN_OBJEKT             121
+#define GFX_SOKOBAN_FELD_LEER          122
+#define GFX_SOKOBAN_FELD_VOLL          123
+#define GFX_GEBLUBBER                  124
 /* Zeile 8 (128) */
-#define GFX_MAGIC_WALL_OFF     128
-#define GFX_MAGIC_WALL_EMPTY   GFX_MAGIC_WALL_OFF
-#define GFX_MAGIC_WALL_FULL    GFX_MAGIC_WALL_OFF
-#define GFX_MAGIC_WALL_DEAD    GFX_MAGIC_WALL_OFF
-#define GFX_ERZ_EDEL           132
-#define GFX_ERZ_DIAM           133
-#define GFX_ERZ_EDEL_ROT       134
-#define GFX_ERZ_EDEL_LILA      135
-#define GFX_ERZ_EDEL_GELB      136
-#define GFX_ERZ_EDEL_BD                137
-#define GFX_EDELSTEIN_GELB     138
-#define GFX_KUGEL_ROT          140
-#define GFX_KUGEL_BLAU         141
-#define GFX_KUGEL_GELB         142
-#define GFX_KUGEL_GRAU         143
+#define GFX_MAGIC_WALL_OFF             128
+#define GFX_MAGIC_WALL_EMPTY           GFX_MAGIC_WALL_OFF
+#define GFX_MAGIC_WALL_FULL            GFX_MAGIC_WALL_OFF
+#define GFX_MAGIC_WALL_DEAD            GFX_MAGIC_WALL_OFF
+#define GFX_ERZ_EDEL                   132
+#define GFX_ERZ_DIAM                   133
+#define GFX_ERZ_EDEL_ROT               134
+#define GFX_ERZ_EDEL_LILA              135
+#define GFX_ERZ_EDEL_GELB              136
+#define GFX_ERZ_EDEL_BD                        137
+#define GFX_EDELSTEIN_GELB             138
+#define GFX_KUGEL_ROT                  140
+#define GFX_KUGEL_BLAU                 141
+#define GFX_KUGEL_GELB                 142
+#define GFX_KUGEL_GRAU                 143
 /* Zeile 9 (144) */
-#define GFX_PINGUIN            144
-#define GFX_MOLE               145
-#define GFX_SCHWEIN            146
-#define GFX_DRACHE             147
-#define GFX_MAUER_XY           148
-#define GFX_MAUER_X            149
-#define GFX_MAUER_Y            150
-#define GFX_EDELSTEIN_ROT      152
-#define GFX_EDELSTEIN_LILA     154
-#define GFX_DYNABOMB_XL                156
-#define GFX_BLACK_ORB          157
-#define GFX_SPEED_PILL         158
-#define GFX_SONDE              159
+#define GFX_PINGUIN                    144
+#define GFX_MOLE                       145
+#define GFX_SCHWEIN                    146
+#define GFX_DRACHE                     147
+#define GFX_MAUER_XY                   148
+#define GFX_MAUER_X                    149
+#define GFX_MAUER_Y                    150
+#define GFX_EDELSTEIN_ROT              152
+#define GFX_EDELSTEIN_LILA             154
+#define GFX_DYNABOMB_XL                        156
+#define GFX_BLACK_ORB                  157
+#define GFX_SPEED_PILL                 158
+#define GFX_SONDE                      159
 /* Zeile 10 (160) */
-#define GFX_EDELSTEIN_BD       163
-#define GFX_MAUER_RIGHT                165
-#define GFX_MAUER_R1           GFX_MAUER_RIGHT
-#define GFX_MAUER_R            167
-#define GFX_MAUER_LEFT         168
-#define GFX_MAUER_L1           GFX_MAUER_LEFT
-#define GFX_MAUER_L            170
-#define GFX_MAUER_LEBT         171
-#define GFX_MAGIC_WALL_BD_OFF  172
-#define GFX_MAGIC_WALL_BD_EMPTY        GFX_MAGIC_WALL_BD_OFF
-#define GFX_MAGIC_WALL_BD_FULL GFX_MAGIC_WALL_BD_OFF
-#define GFX_MAGIC_WALL_BD_DEAD GFX_MAGIC_WALL_BD_OFF
+#define GFX_EDELSTEIN_BD               163
+#define GFX_MAUER_RIGHT                        165
+#define GFX_MAUER_R1                   GFX_MAUER_RIGHT
+#define GFX_MAUER_R                    167
+#define GFX_MAUER_LEFT                 168
+#define GFX_MAUER_L1                   GFX_MAUER_LEFT
+#define GFX_MAUER_L                    170
+#define GFX_MAUER_LEBT                 171
+#define GFX_MAGIC_WALL_BD_OFF          172
+#define GFX_MAGIC_WALL_BD_EMPTY                GFX_MAGIC_WALL_BD_OFF
+#define GFX_MAGIC_WALL_BD_FULL         GFX_MAGIC_WALL_BD_OFF
+#define GFX_MAGIC_WALL_BD_DEAD         GFX_MAGIC_WALL_BD_OFF
 /* Zeile 11 (176) */
-#define        GFX_AUSGANG_ZU          176
-#define        GFX_AUSGANG_ACT         177
-#define        GFX_AUSGANG_AUF         180
-#define GFX_MAMPFER2           184
-#define GFX_DYNABOMB           188
-#define GFX_DYNABOMB_NR                188
-#define GFX_DYNABOMB_SZ                191
+#define        GFX_AUSGANG_ZU                  176
+#define        GFX_AUSGANG_ACT                 177
+#define        GFX_AUSGANG_AUF                 180
+#define GFX_MAMPFER2                   184
+#define GFX_DYNABOMB                   188
+#define GFX_DYNABOMB_NR                        188
+#define GFX_DYNABOMB_SZ                        191
 /* Zeile 12 (192) */
-#define GFX_PFEIL_LEFT         192
-#define GFX_PFEIL_RIGHT                193
-#define GFX_PFEIL_UP           194
-#define GFX_PFEIL_DOWN         195
-#define GFX_BUTTERFLY          196
-#define GFX_FIREFLY            198
-#define GFX_BUTTERFLY_RIGHT    200
-#define GFX_BUTTERFLY_UP       201
-#define GFX_BUTTERFLY_LEFT     202
-#define GFX_BUTTERFLY_DOWN     203
-#define GFX_FIREFLY_RIGHT      204
-#define GFX_FIREFLY_UP         205
-#define GFX_FIREFLY_LEFT       206
-#define GFX_FIREFLY_DOWN       207
+#define GFX_PFEIL_LEFT                 192
+#define GFX_PFEIL_RIGHT                        193
+#define GFX_PFEIL_UP                   194
+#define GFX_PFEIL_DOWN                 195
+#define GFX_BUTTERFLY                  196
+#define GFX_FIREFLY                    198
+#define GFX_BUTTERFLY_RIGHT            200
+#define GFX_BUTTERFLY_UP               201
+#define GFX_BUTTERFLY_LEFT             202
+#define GFX_BUTTERFLY_DOWN             203
+#define GFX_FIREFLY_RIGHT              204
+#define GFX_FIREFLY_UP                 205
+#define GFX_FIREFLY_LEFT               206
+#define GFX_FIREFLY_DOWN               207
 
 /* only available as size MINI_TILE */
-#define GFX_VSTEEL_UPPER_LEFT  208
-#define GFX_VSTEEL_UPPER_RIGHT 209
-#define GFX_VSTEEL_LOWER_LEFT  210
-#define GFX_VSTEEL_LOWER_RIGHT 211
-#define GFX_VSTEEL_HORIZONTAL  212
-#define GFX_VSTEEL_VERTICAL    213
-#define GFX_ISTEEL_UPPER_LEFT  214
-#define GFX_ISTEEL_UPPER_RIGHT 215
-#define GFX_ISTEEL_LOWER_LEFT  216
-#define GFX_ISTEEL_LOWER_RIGHT 217
-#define GFX_ISTEEL_HORIZONTAL  218
-#define GFX_ISTEEL_VERTICAL    219
+#define GFX_VSTEEL_UPPER_LEFT          208
+#define GFX_VSTEEL_UPPER_RIGHT         209
+#define GFX_VSTEEL_LOWER_LEFT          210
+#define GFX_VSTEEL_LOWER_RIGHT         211
+#define GFX_VSTEEL_HORIZONTAL          212
+#define GFX_VSTEEL_VERTICAL            213
+#define GFX_ISTEEL_UPPER_LEFT          214
+#define GFX_ISTEEL_UPPER_RIGHT         215
+#define GFX_ISTEEL_LOWER_LEFT          216
+#define GFX_ISTEEL_LOWER_RIGHT         217
+#define GFX_ISTEEL_HORIZONTAL          218
+#define GFX_ISTEEL_VERTICAL            219
 
 /* elements with graphics borrowed from other elements */
-#define GFX_SCHLUESSEL         GFX_SCHLUESSEL1
-#define GFX_SPIELFIGUR         GFX_SPIELER1
+#define GFX_SCHLUESSEL                 GFX_SCHLUESSEL1
+#define GFX_SPIELFIGUR                 GFX_SPIELER1
 
 /* graphics from "RocksHeroes" */
 #define GFX_SPIELER1_DOWN      (GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE + 0)
 #define IMG_GATE3_GRAY                         37
 #define IMG_GATE4_GRAY                         38
 #define IMG_DYNAMITE                           39
-#define IMG_DYNAMITE_ACTIVE                    40
+#define IMG_DYNAMITE_ACTICE                    40
 #define IMG_SPACESHIP_RIGHT                    41
 #define IMG_SPACESHIP_UP                       42
 #define IMG_SPACESHIP_LEFT                     43
 #define IMG_YAMYAM_MOVING                      55
 #define IMG_ROBOT                              56
 #define IMG_ROBOT_WHEEL                                57
-#define IMG_AMOEBA_DROP                                58
-#define IMG_AMOEBA_CREATING                    59
-#define IMG_AMOEBA1                            60
-#define IMG_AMOEBA2                            61
-#define IMG_AMOEBA3                            62
-#define IMG_AMOEBA4                            63
-#define IMG_AMOEBA_DEAD1                       64
-#define IMG_AMOEBA_DEAD2                       65
-#define IMG_AMOEBA_DEAD3                       66
-#define IMG_AMOEBA_DEAD4                       67
-#define IMG_LAMP_OFF                           68
-#define IMG_LAMP_ON                            69
-#define IMG_TIME_ORB_FULL                      70
-#define IMG_TIME_ORB_EMPTY                     71
-#define IMG_BD_AMOEBA                          72
-#define IMG_SOKOBAN_OBJECT                     73
-#define IMG_SOKOBAN_FIELD_EMPTY                        74
-#define IMG_SOKOBAN_FIELD_FULL                 75
-#define IMG_MAGIC_WALL                         76
-#define IMG_MAGIC_WALL_ACTIVE                  77
-#define IMG_BD_MAGIC_WALL                      78
-#define IMG_BD_MAGIC_WALL_ACTIVE               79
-#define IMG_WALL_EMERALD                       80
-#define IMG_WALL_DIAMOND                       81
-#define IMG_WALL_EMERALD_RED                   82
-#define IMG_WALL_EMERALD_PURPLE                        83
-#define IMG_WALL_EMERALD_YELLOW                        84
-#define IMG_WALL_BD_DIAMOND                    85
-#define IMG_EMERALD_RED                                86
-#define IMG_EMERALD_RED_FALLING                        87
-#define IMG_EMERALD_PURPLE                     88
-#define IMG_EMERALD_PURPLE_FALLING             89
-#define IMG_EMERALD_YELLOW                     90
-#define IMG_EMERALD_YELLOW_FALLING             91
-#define IMG_WALL_GROWING_XY                    92
-#define IMG_WALL_GROWING_X                     93
-#define IMG_WALL_GROWING_Y                     94
-#define IMG_DYNABOMB_XL                                95
-#define IMG_BLACK_ORB                          96
-#define IMG_SPEED_PILL                         97
-#define IMG_BD_DIAMOND                         98
-#define IMG_BD_DIAMOND_FALLING                 99
-#define IMG_WALL_GROWING_RIGHT                 100
-#define IMG_WALL_GROWING_LEFT                  101
-#define IMG_EXIT_CLOSED                                102
-#define IMG_EXIT_OPENING                       103
-#define IMG_EXIT_OPEN                          104
-#define IMG_DARK_YAMYAM                                105
-#define IMG_DYNABOMB_ACTIVE                    106
-#define IMG_DYNABOMB_NR                                107
-#define IMG_DYNABOMB_SZ                                108
-#define IMG_ARROW_LEFT                         109
-#define IMG_ARROW_RIGHT                                110
-#define IMG_ARROW_UP                           111
-#define IMG_ARROW_DOWN                         112
-#define IMG_BD_BUTTERFLY                       113
-#define IMG_BD_BUTTERFLY_MOVING                        114
-#define IMG_BD_BUTTERFLY_RIGHT                 115
-#define IMG_BD_BUTTERFLY_UP                    116
-#define IMG_BD_BUTTERFLY_LEFT                  117
-#define IMG_BD_BUTTERFLY_DOWN                  118
-#define IMG_BD_FIREFLY                         119
-#define IMG_BD_FIREFLY_MOVING                  120
-#define IMG_BD_FIREFLY_RIGHT                   121
-#define IMG_BD_FIREFLY_UP                      122
-#define IMG_BD_FIREFLY_LEFT                    123
-#define IMG_BD_FIREFLY_DOWN                    124
-#define IMG_STEELWALL_TOPLEFT                  125
-#define IMG_STEELWALL_TOPRIGHT                 126
-#define IMG_STEELWALL_BOTTOMLEFT               127
-#define IMG_STEELWALL_BOTTOMRIGHT              128
-#define IMG_STEELWALL_HORIZONTAL               129
-#define IMG_INVISIBLE_STEELWALL_TOPLEFT                130
-#define IMG_INVISIBLE_STEELWALL_TOPRIGHT       131
-#define IMG_INVISIBLE_STEELWALL_BOTTOMLEFT     132
-#define IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT    133
-#define IMG_INVISIBLE_STEELWALL_HORIZONTAL     134
-#define IMG_PLAYER1_DOWN                       135
-#define IMG_PLAYER1_DOWN_MOVING                        136
-#define IMG_PLAYER1_DOWN_DIGGING               137
-#define IMG_PLAYER1_UP                         138
-#define IMG_PLAYER1_UP_MOVING                  139
-#define IMG_PLAYER1_UP_DIGGING                 140
-#define IMG_PLAYER1_LEFT                       141
-#define IMG_PLAYER1_LEFT_MOVING                        142
-#define IMG_PLAYER1_LEFT_DIGGING               143
-#define IMG_PLAYER1_LEFT_PUSHING               144
-#define IMG_PLAYER1_RIGHT                      145
-#define IMG_PLAYER1_RIGHT_MOVING               146
-#define IMG_PLAYER1_RIGHT_DIGGING              147
-#define IMG_PLAYER1_RIGHT_PUSHING              148
-#define IMG_PLAYER2_DOWN                       149
-#define IMG_PLAYER2_DOWN_MOVING                        150
-#define IMG_PLAYER2_DOWN_DIGGING               151
-#define IMG_PLAYER2_UP                         152
-#define IMG_PLAYER2_UP_MOVING                  153
-#define IMG_PLAYER2_UP_DIGGING                 154
-#define IMG_PLAYER2_LEFT                       155
-#define IMG_PLAYER2_LEFT_MOVING                        156
-#define IMG_PLAYER2_LEFT_DIGGING               157
-#define IMG_PLAYER2_LEFT_PUSHING               158
-#define IMG_PLAYER2_RIGHT                      159
-#define IMG_PLAYER2_RIGHT_MOVING               160
-#define IMG_PLAYER2_RIGHT_DIGGING              161
-#define IMG_PLAYER2_RIGHT_PUSHING              162
-#define IMG_PLAYER3_DOWN                       163
-#define IMG_PLAYER3_DOWN_MOVING                        164
-#define IMG_PLAYER3_DOWN_DIGGING               165
-#define IMG_PLAYER3_UP                         166
-#define IMG_PLAYER3_UP_MOVING                  167
-#define IMG_PLAYER3_UP_DIGGING                 168
-#define IMG_PLAYER3_LEFT                       169
-#define IMG_PLAYER3_LEFT_MOVING                        170
-#define IMG_PLAYER3_LEFT_DIGGING               171
-#define IMG_PLAYER3_LEFT_PUSHING               172
-#define IMG_PLAYER3_RIGHT                      173
-#define IMG_PLAYER3_RIGHT_MOVING               174
-#define IMG_PLAYER3_RIGHT_DIGGING              175
-#define IMG_PLAYER3_RIGHT_PUSHING              176
-#define IMG_PLAYER4_DOWN                       177
-#define IMG_PLAYER4_DOWN_MOVING                        178
-#define IMG_PLAYER4_DOWN_DIGGING               179
-#define IMG_PLAYER4_UP                         180
-#define IMG_PLAYER4_UP_MOVING                  181
-#define IMG_PLAYER4_UP_DIGGING                 182
-#define IMG_PLAYER4_LEFT                       183
-#define IMG_PLAYER4_LEFT_MOVING                        184
-#define IMG_PLAYER4_LEFT_DIGGING               185
-#define IMG_PLAYER4_LEFT_PUSHING               186
-#define IMG_PLAYER4_RIGHT                      187
-#define IMG_PLAYER4_RIGHT_MOVING               188
-#define IMG_PLAYER4_RIGHT_DIGGING              189
-#define IMG_PLAYER4_RIGHT_PUSHING              190
-#define IMG_WALL_GROWING_DOWN                  191
-#define IMG_WALL_GROWING_UP                    192
-#define IMG_SHIELD_NORMAL_ACTIVE               193
-#define IMG_SHIELD_DEADLY_ACTIVE               194
-#define IMG_PIG_DOWN                           195
-#define IMG_PIG_DOWN_MOVING                    196
-#define IMG_PIG_DOWN_EATING                    197
-#define IMG_PIG_UP                             198
-#define IMG_PIG_UP_MOVING                      199
-#define IMG_PIG_UP_EATING                      200
-#define IMG_PIG_LEFT                           201
-#define IMG_PIG_LEFT_MOVING                    202
-#define IMG_PIG_LEFT_EATING                    203
-#define IMG_PIG_RIGHT                          204
-#define IMG_PIG_RIGHT_MOVING                   205
-#define IMG_PIG_RIGHT_EATING                   206
-#define IMG_DRAGON_DOWN                                207
-#define IMG_DRAGON_DOWN_MOVING                 208
-#define IMG_DRAGON_DOWN_ATTACKING              209
-#define IMG_DRAGON_UP                          210
-#define IMG_DRAGON_UP_MOVING                   211
-#define IMG_DRAGON_UP_ATTACKING                        212
-#define IMG_DRAGON_LEFT                                213
-#define IMG_DRAGON_LEFT_MOVING                 214
-#define IMG_DRAGON_LEFT_ATTACKING              215
-#define IMG_DRAGON_RIGHT                       216
-#define IMG_DRAGON_RIGHT_MOVING                        217
-#define IMG_DRAGON_RIGHT_ATTACKING             218
-#define IMG_MOLE_DOWN                          219
-#define IMG_MOLE_DOWN_MOVING                   220
-#define IMG_MOLE_DOWN_DIGGING                  221
-#define IMG_MOLE_UP                            222
-#define IMG_MOLE_UP_MOVING                     223
-#define IMG_MOLE_UP_DIGGING                    224
-#define IMG_MOLE_LEFT                          225
-#define IMG_MOLE_LEFT_MOVING                   226
-#define IMG_MOLE_LEFT_DIGGING                  227
-#define IMG_MOLE_RIGHT                         228
-#define IMG_MOLE_RIGHT_MOVING                  229
-#define IMG_MOLE_RIGHT_DIGGING                 230
-#define IMG_PENGUIN_DOWN                       231
-#define IMG_PENGUIN_DOWN_MOVING                        232
-#define IMG_PENGUIN_UP                         233
-#define IMG_PENGUIN_UP_MOVING                  234
-#define IMG_PENGUIN_LEFT                       235
-#define IMG_PENGUIN_LEFT_MOVING                        236
-#define IMG_PENGUIN_RIGHT                      237
-#define IMG_PENGUIN_RIGHT_MOVING               238
-#define IMG_SATELLITE                          239
-#define IMG_SATELLITE_MOVING                   240
-#define IMG_ACID_SPLASHING_LEFT                        241
-#define IMG_ACID_SPLASHING_RIGHT               242
-#define IMG_SPARK_BLUE                         243
-#define IMG_SPARK_WHITE                                244
-#define IMG_FLAMES_LEFT1                       245
-#define IMG_FLAMES_LEFT2                       246
-#define IMG_FLAMES_LEFT3                       247
-#define IMG_FLAMES_RIGHT1                      248
-#define IMG_FLAMES_RIGHT2                      249
-#define IMG_FLAMES_RIGHT3                      250
-#define IMG_FLAMES_UP1                         251
-#define IMG_FLAMES_UP2                         252
-#define IMG_FLAMES_UP3                         253
-#define IMG_FLAMES_DOWN1                       254
-#define IMG_FLAMES_DOWN2                       255
-#define IMG_FLAMES_DOWN3                       256
-#define IMG_SP_EMPTY_SPACE                     257
-#define IMG_SP_ZONK                            258
-#define IMG_SP_ZONK_FALLING                    259
-#define IMG_SP_ZONK_PUSHING                    260
-#define IMG_SP_BASE                            261
-#define IMG_SP_MURPHY                          262
-#define IMG_SP_MURPHY_LEFT                     263
-#define IMG_SP_MURPHY_LEFT_MOVING              264
-#define IMG_SP_MURPHY_LEFT_DIGGING             265
-#define IMG_SP_MURPHY_LEFT_PUSHING             266
-#define IMG_SP_MURPHY_LEFT_SNAPPING            267
-#define IMG_SP_MURPHY_RIGHT                    268
-#define IMG_SP_MURPHY_RIGHT_MOVING             269
-#define IMG_SP_MURPHY_RIGHT_DIGGING            270
-#define IMG_SP_MURPHY_RIGHT_PUSHING            271
-#define IMG_SP_MURPHY_RIGHT_SNAPPING           272
-#define IMG_SP_MURPHY_UP                       273
-#define IMG_SP_MURPHY_UP_SNAPPING              274
-#define IMG_SP_MURPHY_DOWN                     275
-#define IMG_SP_MURPHY_DOWN_SNAPPING            276
-#define IMG_SP_MURPHY_CLONE                    277
-#define IMG_SP_INFOTRON                                278
-#define IMG_SP_INFOTRON_FALLING                        279
-#define IMG_SP_CHIP_SINGLE                     280
-#define IMG_SP_CHIP_LEFT                       281
-#define IMG_SP_CHIP_RIGHT                      282
-#define IMG_SP_CHIP_UPPER                      283
-#define IMG_SP_CHIP_LOWER                      284
-#define IMG_SP_HARD_GRAY                       285
-#define IMG_SP_HARD_GREEN                      286
-#define IMG_SP_HARD_BLUE                       287
-#define IMG_SP_HARD_RED                                288
-#define IMG_SP_HARD_YELLOW                     289
-#define IMG_SP_EXIT_CLOSED                     290
-#define IMG_SP_EXIT_OPEN                       291
-#define IMG_SP_DISK_ORANGE                     292
-#define IMG_SP_DISK_ORANGE_FALLING             293
-#define IMG_SP_DISK_ORANGE_PUSHING             294
-#define IMG_SP_DISK_YELLOW                     295
-#define IMG_SP_DISK_YELLOW_PUSHING             296
-#define IMG_SP_DISK_RED                                297
-#define IMG_SP_DISK_RED_COLLECTING             298
-#define IMG_SP_PORT1_RIGHT                     299
-#define IMG_SP_PORT1_DOWN                      300
-#define IMG_SP_PORT1_LEFT                      301
-#define IMG_SP_PORT1_UP                                302
-#define IMG_SP_PORT2_RIGHT                     303
-#define IMG_SP_PORT2_DOWN                      304
-#define IMG_SP_PORT2_LEFT                      305
-#define IMG_SP_PORT2_UP                                306
-#define IMG_SP_PORT_X                          307
-#define IMG_SP_PORT_Y                          308
-#define IMG_SP_PORT_XY                         309
-#define IMG_SP_SNIKSNAK                                310
-#define IMG_SP_SNIKSNAK_LEFT                   311
-#define IMG_SP_SNIKSNAK_RIGHT                  312
-#define IMG_SP_SNIKSNAK_UP                     313
-#define IMG_SP_SNIKSNAK_DOWN                   314
-#define IMG_SP_ELECTRON                                315
-#define IMG_SP_TERMINAL                                316
-#define IMG_SP_TERMINAL_ACTIVE                 317
-#define IMG_SP_BUGGY_BASE                      318
-#define IMG_SP_BUGGY_BASE_ACTIVATING           319
-#define IMG_SP_HARD_BASE1                      320
-#define IMG_SP_HARD_BASE2                      321
-#define IMG_SP_HARD_BASE3                      322
-#define IMG_SP_HARD_BASE4                      323
-#define IMG_SP_HARD_BASE5                      324
-#define IMG_SP_HARD_BASE6                      325
-#define IMG_INVISIBLE_STEELWALL                        326
-#define IMG_INVISIBLE_STEELWALL_ON             327
-#define IMG_INVISIBLE_SAND                     328
-#define IMG_INVISIBLE_SAND_ON                  329
-#define IMG_INVISIBLE_WALL                     330
-#define IMG_INVISIBLE_WALL_ON                  331
-#define IMG_EM_KEY1                            332
-#define IMG_EM_KEY2                            333
-#define IMG_EM_KEY3                            334
-#define IMG_EM_KEY4                            335
-#define IMG_EM_GATE1                           336
-#define IMG_EM_GATE2                           337
-#define IMG_EM_GATE3                           338
-#define IMG_EM_GATE4                           339
-#define IMG_EM_GATE1_GRAY                      340
-#define IMG_EM_GATE2_GRAY                      341
-#define IMG_EM_GATE3_GRAY                      342
-#define IMG_EM_GATE4_GRAY                      343
-#define IMG_SP_EXPLOSION                       344
-#define IMG_SP_EXPLOSION_INFOTRON              345
-#define IMG_CONVEYOR_BELT1_MIDDLE              346
-#define IMG_CONVEYOR_BELT1_MIDDLE_ACTIVE       347
-#define IMG_CONVEYOR_BELT1_LEFT                        348
-#define IMG_CONVEYOR_BELT1_LEFT_ACTIVE         349
-#define IMG_CONVEYOR_BELT1_RIGHT               350
-#define IMG_CONVEYOR_BELT1_RIGHT_ACTIVE                351
-#define IMG_CONVEYOR_BELT1_SWITCH_LEFT         352
-#define IMG_CONVEYOR_BELT1_SWITCH_MIDDLE       353
-#define IMG_CONVEYOR_BELT1_SWITCH_RIGHT                354
-#define IMG_CONVEYOR_BELT2_MIDDLE              355
-#define IMG_CONVEYOR_BELT2_MIDDLE_ACTIVE       356
-#define IMG_CONVEYOR_BELT2_LEFT                        357
-#define IMG_CONVEYOR_BELT2_LEFT_ACTIVE         358
-#define IMG_CONVEYOR_BELT2_RIGHT               359
-#define IMG_CONVEYOR_BELT2_RIGHT_ACTIVE                360
-#define IMG_CONVEYOR_BELT2_SWITCH_LEFT         361
-#define IMG_CONVEYOR_BELT2_SWITCH_MIDDLE       362
-#define IMG_CONVEYOR_BELT2_SWITCH_RIGHT                363
-#define IMG_CONVEYOR_BELT3_MIDDLE              364
-#define IMG_CONVEYOR_BELT3_MIDDLE_ACTIVE       365
-#define IMG_CONVEYOR_BELT3_LEFT                        366
-#define IMG_CONVEYOR_BELT3_LEFT_ACTIVE         367
-#define IMG_CONVEYOR_BELT3_RIGHT               368
-#define IMG_CONVEYOR_BELT3_RIGHT_ACTIVE                369
-#define IMG_CONVEYOR_BELT3_SWITCH_LEFT         370
-#define IMG_CONVEYOR_BELT3_SWITCH_MIDDLE       371
-#define IMG_CONVEYOR_BELT3_SWITCH_RIGHT                372
-#define IMG_CONVEYOR_BELT4_MIDDLE              373
-#define IMG_CONVEYOR_BELT4_MIDDLE_ACTIVE       374
-#define IMG_CONVEYOR_BELT4_LEFT                        375
-#define IMG_CONVEYOR_BELT4_LEFT_ACTIVE         376
-#define IMG_CONVEYOR_BELT4_RIGHT               377
-#define IMG_CONVEYOR_BELT4_RIGHT_ACTIVE                378
-#define IMG_CONVEYOR_BELT4_SWITCH_LEFT         379
-#define IMG_CONVEYOR_BELT4_SWITCH_MIDDLE       380
-#define IMG_CONVEYOR_BELT4_SWITCH_RIGHT                381
-#define IMG_SWITCHGATE_SWITCH_UP               382
-#define IMG_SWITCHGATE_SWITCH_DOWN             383
-#define IMG_LIGHT_SWITCH_OFF                   384
-#define IMG_LIGHT_SWITCH_ON                    385
-#define IMG_TIMEGATE_WHEEL                     386
-#define IMG_TIMEGATE_WHEEL_ACTIVE              387
-#define IMG_ENVELOPE                           388
-#define IMG_SIGN_EXCLAMATION                   389
-#define IMG_SIGN_STOP                          390
-#define IMG_LANDMINE                           391
-#define IMG_STEELWALL_SLANTED                  392
-#define IMG_EXTRA_TIME                         393
-#define IMG_SHIELD_DEADLY                      394
-#define IMG_SHIELD_NORMAL                      395
-#define IMG_SWITCHGATE_CLOSED                  396
-#define IMG_SWITCHGATE_OPENING                 397
-#define IMG_SWITCHGATE_OPEN                    398
-#define IMG_SWITCHGATE_CLOSING                 399
-#define IMG_TIMEGATE_CLOSED                    400
-#define IMG_TIMEGATE_OPENING                   401
-#define IMG_TIMEGATE_OPEN                      402
-#define IMG_TIMEGATE_CLOSING                   403
-#define IMG_BALLOON                            404
-#define IMG_BALLOON_MOVING                     405
-#define IMG_BALLOON_WINDROSE_LEFT              406
-#define IMG_BALLOON_WINDROSE_RIGHT             407
-#define IMG_BALLOON_WINDROSE_UP                        408
-#define IMG_BALLOON_WINDROSE_DOWN              409
-#define IMG_BALLOON_WINDROSE_ALL               410
-#define IMG_EMC_STEELWALL1                     411
-#define IMG_EMC_STEELWALL2                     412
-#define IMG_EMC_STEELWALL3                     413
-#define IMG_EMC_STEELWALL4                     414
-#define IMG_EMC_WALL_PILLAR_UPPER              415
-#define IMG_EMC_WALL_PILLAR_MIDDLE             416
-#define IMG_EMC_WALL_PILLAR_LOWER              417
-#define IMG_EMC_WALL4                          418
-#define IMG_EMC_WALL5                          419
-#define IMG_EMC_WALL6                          420
-#define IMG_EMC_WALL7                          421
-#define IMG_EMC_WALL8                          422
-#define IMG_ARROW_BLUE_LEFT                    423
-#define IMG_ARROW_BLUE_RIGHT                   424
-#define IMG_ARROW_BLUE_UP                      425
-#define IMG_ARROW_BLUE_DOWN                    426
-#define IMG_ARROW_RED_LEFT                     427
-#define IMG_ARROW_RED_RIGHT                    428
-#define IMG_ARROW_RED_UP                       429
-#define IMG_ARROW_RED_DOWN                     430
-#define IMG_SCROLLBAR_BLUE                     431
-#define IMG_SCROLLBAR_RED                      432
-#define IMG_SCROLLBAR_GREEN                    433
-#define IMG_SCROLLBAR_YELLOW                   434
-#define IMG_PEARL                              435
-#define IMG_PEARL_BREAKING                     436
-#define IMG_CRYSTAL                            437
-#define IMG_WALL_PEARL                         438
-#define IMG_WALL_CRYSTAL                       439
-#define IMG_SPRING                             440
-#define IMG_TUBE_RIGHT_DOWN                    441
-#define IMG_TUBE_HORIZONTAL_DOWN               442
-#define IMG_TUBE_LEFT_DOWN                     443
-#define IMG_TUBE_HORIZONTAL                    444
-#define IMG_TUBE_VERTICAL_RIGHT                        445
-#define IMG_TUBE_ALL                           446
-#define IMG_TUBE_VERTICAL_LEFT                 447
-#define IMG_TUBE_VERTICAL                      448
-#define IMG_TUBE_RIGHT_UP                      449
-#define IMG_TUBE_HORIZONTAL_UP                 450
-#define IMG_TUBE_LEFT_UP                       451
-#define IMG_TRAP_INACTIVE                      452
-#define IMG_TRAP_ACTIVE                                453
-#define IMG_TRAP_ACTIVATING                    454
-#define IMG_BD_WALL                            455
-#define IMG_BD_ROCK                            456
-#define IMG_BD_ROCK_FALLING                    457
-#define IMG_BD_ROCK_PUSHING                    458
-#define IMG_DX_BOMB                            459
-
-#define NUM_IMAGE_FILES                                460
+#define IMG_ROBOT_WHEEL_ACTIVE                 58
+#define IMG_AMOEBA_DROP                                59
+#define IMG_AMOEBA_CREATING                    60
+#define IMG_AMOEBA1                            61
+#define IMG_AMOEBA2                            62
+#define IMG_AMOEBA3                            63
+#define IMG_AMOEBA4                            64
+#define IMG_AMOEBA_DEAD1                       65
+#define IMG_AMOEBA_DEAD2                       66
+#define IMG_AMOEBA_DEAD3                       67
+#define IMG_AMOEBA_DEAD4                       68
+#define IMG_LAMP                               69
+#define IMG_LAMP_ACTIVE                                70
+#define IMG_TIME_ORB_FULL                      71
+#define IMG_TIME_ORB_EMPTY                     72
+#define IMG_BD_AMOEBA                          73
+#define IMG_SOKOBAN_OBJECT                     74
+#define IMG_SOKOBAN_FIELD_EMPTY                        75
+#define IMG_SOKOBAN_FIELD_FULL                 76
+#define IMG_MAGIC_WALL                         77
+#define IMG_MAGIC_WALL_ACTIVE                  78
+#define IMG_BD_MAGIC_WALL                      79
+#define IMG_BD_MAGIC_WALL_ACTIVE               80
+#define IMG_WALL_EMERALD                       81
+#define IMG_WALL_DIAMOND                       82
+#define IMG_WALL_EMERALD_RED                   83
+#define IMG_WALL_EMERALD_PURPLE                        84
+#define IMG_WALL_EMERALD_YELLOW                        85
+#define IMG_WALL_BD_DIAMOND                    86
+#define IMG_EMERALD_RED                                87
+#define IMG_EMERALD_RED_FALLING                        88
+#define IMG_EMERALD_PURPLE                     89
+#define IMG_EMERALD_PURPLE_FALLING             90
+#define IMG_EMERALD_YELLOW                     91
+#define IMG_EMERALD_YELLOW_FALLING             92
+#define IMG_WALL_GROWING_XY                    93
+#define IMG_WALL_GROWING_X                     94
+#define IMG_WALL_GROWING_Y                     95
+#define IMG_DYNABOMB_XL                                96
+#define IMG_BLACK_ORB                          97
+#define IMG_SPEED_PILL                         98
+#define IMG_BD_DIAMOND                         99
+#define IMG_BD_DIAMOND_FALLING                 100
+#define IMG_WALL_GROWING_RIGHT                 101
+#define IMG_WALL_GROWING_LEFT                  102
+#define IMG_EXIT_CLOSED                                103
+#define IMG_EXIT_OPENING                       104
+#define IMG_EXIT_OPEN                          105
+#define IMG_DARK_YAMYAM                                106
+#define IMG_DYNABOMB_ACTICE                    107
+#define IMG_DYNABOMB_NR                                108
+#define IMG_DYNABOMB_SZ                                109
+#define IMG_ARROW_LEFT                         110
+#define IMG_ARROW_RIGHT                                111
+#define IMG_ARROW_UP                           112
+#define IMG_ARROW_DOWN                         113
+#define IMG_BD_BUTTERFLY                       114
+#define IMG_BD_BUTTERFLY_MOVING                        115
+#define IMG_BD_BUTTERFLY_RIGHT                 116
+#define IMG_BD_BUTTERFLY_UP                    117
+#define IMG_BD_BUTTERFLY_LEFT                  118
+#define IMG_BD_BUTTERFLY_DOWN                  119
+#define IMG_BD_FIREFLY                         120
+#define IMG_BD_FIREFLY_MOVING                  121
+#define IMG_BD_FIREFLY_RIGHT                   122
+#define IMG_BD_FIREFLY_UP                      123
+#define IMG_BD_FIREFLY_LEFT                    124
+#define IMG_BD_FIREFLY_DOWN                    125
+#define IMG_STEELWALL_TOPLEFT                  126
+#define IMG_STEELWALL_TOPRIGHT                 127
+#define IMG_STEELWALL_BOTTOMLEFT               128
+#define IMG_STEELWALL_BOTTOMRIGHT              129
+#define IMG_STEELWALL_HORIZONTAL               130
+#define IMG_INVISIBLE_STEELWALL_TOPLEFT                131
+#define IMG_INVISIBLE_STEELWALL_TOPRIGHT       132
+#define IMG_INVISIBLE_STEELWALL_BOTTOMLEFT     133
+#define IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT    134
+#define IMG_INVISIBLE_STEELWALL_HORIZONTAL     135
+#define IMG_PLAYER1_DOWN                       136
+#define IMG_PLAYER1_DOWN_MOVING                        137
+#define IMG_PLAYER1_DOWN_DIGGING               138
+#define IMG_PLAYER1_UP                         139
+#define IMG_PLAYER1_UP_MOVING                  140
+#define IMG_PLAYER1_UP_DIGGING                 141
+#define IMG_PLAYER1_LEFT                       142
+#define IMG_PLAYER1_LEFT_MOVING                        143
+#define IMG_PLAYER1_LEFT_DIGGING               144
+#define IMG_PLAYER1_LEFT_PUSHING               145
+#define IMG_PLAYER1_RIGHT                      146
+#define IMG_PLAYER1_RIGHT_MOVING               147
+#define IMG_PLAYER1_RIGHT_DIGGING              148
+#define IMG_PLAYER1_RIGHT_PUSHING              149
+#define IMG_PLAYER2_DOWN                       150
+#define IMG_PLAYER2_DOWN_MOVING                        151
+#define IMG_PLAYER2_DOWN_DIGGING               152
+#define IMG_PLAYER2_UP                         153
+#define IMG_PLAYER2_UP_MOVING                  154
+#define IMG_PLAYER2_UP_DIGGING                 155
+#define IMG_PLAYER2_LEFT                       156
+#define IMG_PLAYER2_LEFT_MOVING                        157
+#define IMG_PLAYER2_LEFT_DIGGING               158
+#define IMG_PLAYER2_LEFT_PUSHING               159
+#define IMG_PLAYER2_RIGHT                      160
+#define IMG_PLAYER2_RIGHT_MOVING               161
+#define IMG_PLAYER2_RIGHT_DIGGING              162
+#define IMG_PLAYER2_RIGHT_PUSHING              163
+#define IMG_PLAYER3_DOWN                       164
+#define IMG_PLAYER3_DOWN_MOVING                        165
+#define IMG_PLAYER3_DOWN_DIGGING               166
+#define IMG_PLAYER3_UP                         167
+#define IMG_PLAYER3_UP_MOVING                  168
+#define IMG_PLAYER3_UP_DIGGING                 169
+#define IMG_PLAYER3_LEFT                       170
+#define IMG_PLAYER3_LEFT_MOVING                        171
+#define IMG_PLAYER3_LEFT_DIGGING               172
+#define IMG_PLAYER3_LEFT_PUSHING               173
+#define IMG_PLAYER3_RIGHT                      174
+#define IMG_PLAYER3_RIGHT_MOVING               175
+#define IMG_PLAYER3_RIGHT_DIGGING              176
+#define IMG_PLAYER3_RIGHT_PUSHING              177
+#define IMG_PLAYER4_DOWN                       178
+#define IMG_PLAYER4_DOWN_MOVING                        179
+#define IMG_PLAYER4_DOWN_DIGGING               180
+#define IMG_PLAYER4_UP                         181
+#define IMG_PLAYER4_UP_MOVING                  182
+#define IMG_PLAYER4_UP_DIGGING                 183
+#define IMG_PLAYER4_LEFT                       184
+#define IMG_PLAYER4_LEFT_MOVING                        185
+#define IMG_PLAYER4_LEFT_DIGGING               186
+#define IMG_PLAYER4_LEFT_PUSHING               187
+#define IMG_PLAYER4_RIGHT                      188
+#define IMG_PLAYER4_RIGHT_MOVING               189
+#define IMG_PLAYER4_RIGHT_DIGGING              190
+#define IMG_PLAYER4_RIGHT_PUSHING              191
+#define IMG_WALL_GROWING_DOWN                  192
+#define IMG_WALL_GROWING_UP                    193
+#define IMG_SHIELD_NORMAL_ACTIVE               194
+#define IMG_SHIELD_DEADLY_ACTIVE               195
+#define IMG_PIG_DOWN                           196
+#define IMG_PIG_DOWN_MOVING                    197
+#define IMG_PIG_DOWN_EATING                    198
+#define IMG_PIG_UP                             199
+#define IMG_PIG_UP_MOVING                      200
+#define IMG_PIG_UP_EATING                      201
+#define IMG_PIG_LEFT                           202
+#define IMG_PIG_LEFT_MOVING                    203
+#define IMG_PIG_LEFT_EATING                    204
+#define IMG_PIG_RIGHT                          205
+#define IMG_PIG_RIGHT_MOVING                   206
+#define IMG_PIG_RIGHT_EATING                   207
+#define IMG_DRAGON_DOWN                                208
+#define IMG_DRAGON_DOWN_MOVING                 209
+#define IMG_DRAGON_DOWN_ATTACKING              210
+#define IMG_DRAGON_UP                          211
+#define IMG_DRAGON_UP_MOVING                   212
+#define IMG_DRAGON_UP_ATTACKING                        213
+#define IMG_DRAGON_LEFT                                214
+#define IMG_DRAGON_LEFT_MOVING                 215
+#define IMG_DRAGON_LEFT_ATTACKING              216
+#define IMG_DRAGON_RIGHT                       217
+#define IMG_DRAGON_RIGHT_MOVING                        218
+#define IMG_DRAGON_RIGHT_ATTACKING             219
+#define IMG_MOLE_DOWN                          220
+#define IMG_MOLE_DOWN_MOVING                   221
+#define IMG_MOLE_DOWN_DIGGING                  222
+#define IMG_MOLE_UP                            223
+#define IMG_MOLE_UP_MOVING                     224
+#define IMG_MOLE_UP_DIGGING                    225
+#define IMG_MOLE_LEFT                          226
+#define IMG_MOLE_LEFT_MOVING                   227
+#define IMG_MOLE_LEFT_DIGGING                  228
+#define IMG_MOLE_RIGHT                         229
+#define IMG_MOLE_RIGHT_MOVING                  230
+#define IMG_MOLE_RIGHT_DIGGING                 231
+#define IMG_PENGUIN_DOWN                       232
+#define IMG_PENGUIN_DOWN_MOVING                        233
+#define IMG_PENGUIN_UP                         234
+#define IMG_PENGUIN_UP_MOVING                  235
+#define IMG_PENGUIN_LEFT                       236
+#define IMG_PENGUIN_LEFT_MOVING                        237
+#define IMG_PENGUIN_RIGHT                      238
+#define IMG_PENGUIN_RIGHT_MOVING               239
+#define IMG_SATELLITE                          240
+#define IMG_SATELLITE_MOVING                   241
+#define IMG_ACID_SPLASHING_LEFT                        242
+#define IMG_ACID_SPLASHING_RIGHT               243
+#define IMG_SPARK_BLUE                         244
+#define IMG_SPARK_WHITE                                245
+#define IMG_FLAMES_LEFT1                       246
+#define IMG_FLAMES_LEFT2                       247
+#define IMG_FLAMES_LEFT3                       248
+#define IMG_FLAMES_RIGHT1                      249
+#define IMG_FLAMES_RIGHT2                      250
+#define IMG_FLAMES_RIGHT3                      251
+#define IMG_FLAMES_UP1                         252
+#define IMG_FLAMES_UP2                         253
+#define IMG_FLAMES_UP3                         254
+#define IMG_FLAMES_DOWN1                       255
+#define IMG_FLAMES_DOWN2                       256
+#define IMG_FLAMES_DOWN3                       257
+#define IMG_SP_EMPTY_SPACE                     258
+#define IMG_SP_ZONK                            259
+#define IMG_SP_ZONK_FALLING                    260
+#define IMG_SP_ZONK_PUSHING                    261
+#define IMG_SP_BASE                            262
+#define IMG_SP_MURPHY                          263
+#define IMG_SP_MURPHY_LEFT                     264
+#define IMG_SP_MURPHY_LEFT_MOVING              265
+#define IMG_SP_MURPHY_LEFT_DIGGING             266
+#define IMG_SP_MURPHY_LEFT_PUSHING             267
+#define IMG_SP_MURPHY_LEFT_SNAPPING            268
+#define IMG_SP_MURPHY_RIGHT                    269
+#define IMG_SP_MURPHY_RIGHT_MOVING             270
+#define IMG_SP_MURPHY_RIGHT_DIGGING            271
+#define IMG_SP_MURPHY_RIGHT_PUSHING            272
+#define IMG_SP_MURPHY_RIGHT_SNAPPING           273
+#define IMG_SP_MURPHY_UP                       274
+#define IMG_SP_MURPHY_UP_SNAPPING              275
+#define IMG_SP_MURPHY_DOWN                     276
+#define IMG_SP_MURPHY_DOWN_SNAPPING            277
+#define IMG_SP_MURPHY_CLONE                    278
+#define IMG_SP_INFOTRON                                279
+#define IMG_SP_INFOTRON_FALLING                        280
+#define IMG_SP_CHIP_SINGLE                     281
+#define IMG_SP_CHIP_LEFT                       282
+#define IMG_SP_CHIP_RIGHT                      283
+#define IMG_SP_CHIP_UPPER                      284
+#define IMG_SP_CHIP_LOWER                      285
+#define IMG_SP_HARD_GRAY                       286
+#define IMG_SP_HARD_GREEN                      287
+#define IMG_SP_HARD_BLUE                       288
+#define IMG_SP_HARD_RED                                289
+#define IMG_SP_HARD_YELLOW                     290
+#define IMG_SP_EXIT_CLOSED                     291
+#define IMG_SP_EXIT_OPEN                       292
+#define IMG_SP_DISK_ORANGE                     293
+#define IMG_SP_DISK_ORANGE_FALLING             294
+#define IMG_SP_DISK_ORANGE_PUSHING             295
+#define IMG_SP_DISK_YELLOW                     296
+#define IMG_SP_DISK_YELLOW_PUSHING             297
+#define IMG_SP_DISK_RED                                298
+#define IMG_SP_DISK_RED_COLLECTING             299
+#define IMG_SP_PORT1_RIGHT                     300
+#define IMG_SP_PORT1_DOWN                      301
+#define IMG_SP_PORT1_LEFT                      302
+#define IMG_SP_PORT1_UP                                303
+#define IMG_SP_PORT2_RIGHT                     304
+#define IMG_SP_PORT2_DOWN                      305
+#define IMG_SP_PORT2_LEFT                      306
+#define IMG_SP_PORT2_UP                                307
+#define IMG_SP_PORT_X                          308
+#define IMG_SP_PORT_Y                          309
+#define IMG_SP_PORT_XY                         310
+#define IMG_SP_SNIKSNAK                                311
+#define IMG_SP_SNIKSNAK_LEFT                   312
+#define IMG_SP_SNIKSNAK_RIGHT                  313
+#define IMG_SP_SNIKSNAK_UP                     314
+#define IMG_SP_SNIKSNAK_DOWN                   315
+#define IMG_SP_ELECTRON                                316
+#define IMG_SP_TERMINAL                                317
+#define IMG_SP_TERMINAL_ACTIVE                 318
+#define IMG_SP_BUGGY_BASE                      319
+#define IMG_SP_BUGGY_BASE_ACTIVATING           320
+#define IMG_SP_HARD_BASE1                      321
+#define IMG_SP_HARD_BASE2                      322
+#define IMG_SP_HARD_BASE3                      323
+#define IMG_SP_HARD_BASE4                      324
+#define IMG_SP_HARD_BASE5                      325
+#define IMG_SP_HARD_BASE6                      326
+#define IMG_INVISIBLE_STEELWALL                        327
+#define IMG_INVISIBLE_STEELWALL_ACTIVE         328
+#define IMG_INVISIBLE_SAND                     329
+#define IMG_INVISIBLE_SAND_ACTIVE              330
+#define IMG_INVISIBLE_WALL                     331
+#define IMG_INVISIBLE_WALL_ACTIVE              332
+#define IMG_EM_KEY1                            333
+#define IMG_EM_KEY2                            334
+#define IMG_EM_KEY3                            335
+#define IMG_EM_KEY4                            336
+#define IMG_EM_GATE1                           337
+#define IMG_EM_GATE2                           338
+#define IMG_EM_GATE3                           339
+#define IMG_EM_GATE4                           340
+#define IMG_EM_GATE1_GRAY                      341
+#define IMG_EM_GATE2_GRAY                      342
+#define IMG_EM_GATE3_GRAY                      343
+#define IMG_EM_GATE4_GRAY                      344
+#define IMG_SP_EXPLOSION                       345
+#define IMG_SP_EXPLOSION_INFOTRON              346
+#define IMG_CONVEYOR_BELT1_MIDDLE              347
+#define IMG_CONVEYOR_BELT1_MIDDLE_ACTIVE       348
+#define IMG_CONVEYOR_BELT1_LEFT                        349
+#define IMG_CONVEYOR_BELT1_LEFT_ACTIVE         350
+#define IMG_CONVEYOR_BELT1_RIGHT               351
+#define IMG_CONVEYOR_BELT1_RIGHT_ACTIVE                352
+#define IMG_CONVEYOR_BELT1_SWITCH_LEFT         353
+#define IMG_CONVEYOR_BELT1_SWITCH_MIDDLE       354
+#define IMG_CONVEYOR_BELT1_SWITCH_RIGHT                355
+#define IMG_CONVEYOR_BELT2_MIDDLE              356
+#define IMG_CONVEYOR_BELT2_MIDDLE_ACTIVE       357
+#define IMG_CONVEYOR_BELT2_LEFT                        358
+#define IMG_CONVEYOR_BELT2_LEFT_ACTIVE         359
+#define IMG_CONVEYOR_BELT2_RIGHT               360
+#define IMG_CONVEYOR_BELT2_RIGHT_ACTIVE                361
+#define IMG_CONVEYOR_BELT2_SWITCH_LEFT         362
+#define IMG_CONVEYOR_BELT2_SWITCH_MIDDLE       363
+#define IMG_CONVEYOR_BELT2_SWITCH_RIGHT                364
+#define IMG_CONVEYOR_BELT3_MIDDLE              365
+#define IMG_CONVEYOR_BELT3_MIDDLE_ACTIVE       366
+#define IMG_CONVEYOR_BELT3_LEFT                        367
+#define IMG_CONVEYOR_BELT3_LEFT_ACTIVE         368
+#define IMG_CONVEYOR_BELT3_RIGHT               369
+#define IMG_CONVEYOR_BELT3_RIGHT_ACTIVE                370
+#define IMG_CONVEYOR_BELT3_SWITCH_LEFT         371
+#define IMG_CONVEYOR_BELT3_SWITCH_MIDDLE       372
+#define IMG_CONVEYOR_BELT3_SWITCH_RIGHT                373
+#define IMG_CONVEYOR_BELT4_MIDDLE              374
+#define IMG_CONVEYOR_BELT4_MIDDLE_ACTIVE       375
+#define IMG_CONVEYOR_BELT4_LEFT                        376
+#define IMG_CONVEYOR_BELT4_LEFT_ACTIVE         377
+#define IMG_CONVEYOR_BELT4_RIGHT               378
+#define IMG_CONVEYOR_BELT4_RIGHT_ACTIVE                379
+#define IMG_CONVEYOR_BELT4_SWITCH_LEFT         380
+#define IMG_CONVEYOR_BELT4_SWITCH_MIDDLE       381
+#define IMG_CONVEYOR_BELT4_SWITCH_RIGHT                382
+#define IMG_SWITCHGATE_SWITCH_UP               383
+#define IMG_SWITCHGATE_SWITCH_DOWN             384
+#define IMG_LIGHT_SWITCH                       385
+#define IMG_LIGHT_SWITCH_ACTIVE                        386
+#define IMG_TIMEGATE_WHEEL                     387
+#define IMG_TIMEGATE_WHEEL_ACTIVE              388
+#define IMG_ENVELOPE                           389
+#define IMG_SIGN_EXCLAMATION                   390
+#define IMG_SIGN_STOP                          391
+#define IMG_LANDMINE                           392
+#define IMG_STEELWALL_SLANTED                  393
+#define IMG_EXTRA_TIME                         394
+#define IMG_SHIELD_DEADLY                      395
+#define IMG_SHIELD_NORMAL                      396
+#define IMG_SWITCHGATE_CLOSED                  397
+#define IMG_SWITCHGATE_OPENING                 398
+#define IMG_SWITCHGATE_OPEN                    399
+#define IMG_SWITCHGATE_CLOSING                 400
+#define IMG_TIMEGATE_CLOSED                    401
+#define IMG_TIMEGATE_OPENING                   402
+#define IMG_TIMEGATE_OPEN                      403
+#define IMG_TIMEGATE_CLOSING                   404
+#define IMG_BALLOON                            405
+#define IMG_BALLOON_MOVING                     406
+#define IMG_BALLOON_WINDROSE_LEFT              407
+#define IMG_BALLOON_WINDROSE_RIGHT             408
+#define IMG_BALLOON_WINDROSE_UP                        409
+#define IMG_BALLOON_WINDROSE_DOWN              410
+#define IMG_BALLOON_WINDROSE_ALL               411
+#define IMG_EMC_STEELWALL1                     412
+#define IMG_EMC_STEELWALL2                     413
+#define IMG_EMC_STEELWALL3                     414
+#define IMG_EMC_STEELWALL4                     415
+#define IMG_EMC_WALL_PILLAR_UPPER              416
+#define IMG_EMC_WALL_PILLAR_MIDDLE             417
+#define IMG_EMC_WALL_PILLAR_LOWER              418
+#define IMG_EMC_WALL4                          419
+#define IMG_EMC_WALL5                          420
+#define IMG_EMC_WALL6                          421
+#define IMG_EMC_WALL7                          422
+#define IMG_EMC_WALL8                          423
+#define IMG_ARROW_BLUE_LEFT                    424
+#define IMG_ARROW_BLUE_RIGHT                   425
+#define IMG_ARROW_BLUE_UP                      426
+#define IMG_ARROW_BLUE_DOWN                    427
+#define IMG_ARROW_RED_LEFT                     428
+#define IMG_ARROW_RED_RIGHT                    429
+#define IMG_ARROW_RED_UP                       430
+#define IMG_ARROW_RED_DOWN                     431
+#define IMG_SCROLLBAR_BLUE                     432
+#define IMG_SCROLLBAR_RED                      433
+#define IMG_SCROLLBAR_GREEN                    434
+#define IMG_SCROLLBAR_YELLOW                   435
+#define IMG_PEARL                              436
+#define IMG_PEARL_BREAKING                     437
+#define IMG_CRYSTAL                            438
+#define IMG_WALL_PEARL                         439
+#define IMG_WALL_CRYSTAL                       440
+#define IMG_SPRING                             441
+#define IMG_TUBE_RIGHT_DOWN                    442
+#define IMG_TUBE_HORIZONTAL_DOWN               443
+#define IMG_TUBE_LEFT_DOWN                     444
+#define IMG_TUBE_HORIZONTAL                    445
+#define IMG_TUBE_VERTICAL_RIGHT                        446
+#define IMG_TUBE_ALL                           447
+#define IMG_TUBE_VERTICAL_LEFT                 448
+#define IMG_TUBE_VERTICAL                      449
+#define IMG_TUBE_RIGHT_UP                      450
+#define IMG_TUBE_HORIZONTAL_UP                 451
+#define IMG_TUBE_LEFT_UP                       452
+#define IMG_TRAP_INACTIVE                      453
+#define IMG_TRAP_ACTIVE                                454
+#define IMG_TRAP_ACTIVATING                    455
+#define IMG_BD_WALL                            456
+#define IMG_BD_ROCK                            457
+#define IMG_BD_ROCK_FALLING                    458
+#define IMG_BD_ROCK_PUSHING                    459
+#define IMG_DX_BOMB                            460
+
+#define NUM_IMAGE_FILES                                461
 
 
 /* values for sound configuration suffixes */
index 0269c4df07b4a75e98ed725cd47f73d453a53e19..dd1ef61220fcbc42e1ee7c482d55fdf765132a3a 100644 (file)
@@ -1346,29 +1346,29 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
   {
     graphic = GFX2_SP_ELECTRON + getGraphicAnimationPhase(8, 2, ANIM_NORMAL);
   }
-  else if (element == EL_MOLE || element == EL_PINGUIN ||
-          element == EL_SCHWEIN || element == EL_DRACHE)
+  else if (element == EL_MOLE || element == EL_PENGUIN ||
+          element == EL_PIG || element == EL_DRAGON)
   {
     if (dir == MV_LEFT)
       graphic = (element == EL_MOLE ? GFX_MOLE_LEFT :
-                element == EL_PINGUIN ? GFX_PINGUIN_LEFT :
-                element == EL_SCHWEIN ? GFX_SCHWEIN_LEFT : GFX_DRACHE_LEFT);
+                element == EL_PENGUIN ? GFX_PINGUIN_LEFT :
+                element == EL_PIG ? GFX_SCHWEIN_LEFT : GFX_DRACHE_LEFT);
     else if (dir == MV_RIGHT)
       graphic = (element == EL_MOLE ? GFX_MOLE_RIGHT :
-                element == EL_PINGUIN ? GFX_PINGUIN_RIGHT :
-                element == EL_SCHWEIN ? GFX_SCHWEIN_RIGHT : GFX_DRACHE_RIGHT);
+                element == EL_PENGUIN ? GFX_PINGUIN_RIGHT :
+                element == EL_PIG ? GFX_SCHWEIN_RIGHT : GFX_DRACHE_RIGHT);
     else if (dir == MV_UP)
       graphic = (element == EL_MOLE ? GFX_MOLE_UP :
-                element == EL_PINGUIN ? GFX_PINGUIN_UP :
-                element == EL_SCHWEIN ? GFX_SCHWEIN_UP : GFX_DRACHE_UP);
+                element == EL_PENGUIN ? GFX_PINGUIN_UP :
+                element == EL_PIG ? GFX_SCHWEIN_UP : GFX_DRACHE_UP);
     else
       graphic = (element == EL_MOLE ? GFX_MOLE_DOWN :
-                element == EL_PINGUIN ? GFX_PINGUIN_DOWN :
-                element == EL_SCHWEIN ? GFX_SCHWEIN_DOWN : GFX_DRACHE_DOWN);
+                element == EL_PENGUIN ? GFX_PINGUIN_DOWN :
+                element == EL_PIG ? GFX_SCHWEIN_DOWN : GFX_DRACHE_DOWN);
 
     graphic += phase4;
   }
-  else if (element == EL_SONDE)
+  else if (element == EL_SATELLITE)
   {
     graphic = GFX_SONDE_START + getGraphicAnimationPhase(8, 2, ANIM_NORMAL);
   }
@@ -1422,7 +1422,7 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
     graphic = (element == EL_AMOEBA_DEAD ? GFX_AMOEBE_TOT : GFX_AMOEBE_LEBT);
     graphic += (x + 2 * y + 4) % 4;
   }
-  else if (element == EL_MAUER_LEBT)
+  else if (element == EL_WALL_GROWING)
   {
     boolean links_massiv = FALSE, rechts_massiv = FALSE;
 
@@ -1438,11 +1438,11 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
     else if (rechts_massiv)
       graphic = GFX_MAUER_L;
   }
-  else if ((element == EL_INVISIBLE_STEEL ||
+  else if ((element == EL_INVISIBLE_STEELWALL ||
            element == EL_INVISIBLE_WALL ||
            element == EL_SAND_INVISIBLE) && game.light_time_left)
   {
-    graphic = (element == EL_INVISIBLE_STEEL ? GFX_INVISIBLE_STEEL_ON :
+    graphic = (element == EL_INVISIBLE_STEELWALL ? GFX_INVISIBLE_STEEL_ON :
               element == EL_INVISIBLE_WALL ? GFX_UNSICHTBAR_ON :
               GFX_SAND_INVISIBLE_ON);
   }
@@ -1504,29 +1504,29 @@ void DrawNewScreenElementExt(int x, int y, int dx, int dy, int element,
     graphic = GFX2_SP_ELECTRON + getGraphicAnimationPhase(8, 2, ANIM_NORMAL);
   }
 #endif
-  else if (element == EL_MOLE || element == EL_PINGUIN ||
-          element == EL_SCHWEIN || element == EL_DRACHE)
+  else if (element == EL_MOLE || element == EL_PENGUIN ||
+          element == EL_PIG || element == EL_DRAGON)
   {
     if (dir == MV_LEFT)
       graphic = (element == EL_MOLE ? GFX_MOLE_LEFT :
-                element == EL_PINGUIN ? GFX_PINGUIN_LEFT :
-                element == EL_SCHWEIN ? GFX_SCHWEIN_LEFT : GFX_DRACHE_LEFT);
+                element == EL_PENGUIN ? GFX_PINGUIN_LEFT :
+                element == EL_PIG ? GFX_SCHWEIN_LEFT : GFX_DRACHE_LEFT);
     else if (dir == MV_RIGHT)
       graphic = (element == EL_MOLE ? GFX_MOLE_RIGHT :
-                element == EL_PINGUIN ? GFX_PINGUIN_RIGHT :
-                element == EL_SCHWEIN ? GFX_SCHWEIN_RIGHT : GFX_DRACHE_RIGHT);
+                element == EL_PENGUIN ? GFX_PINGUIN_RIGHT :
+                element == EL_PIG ? GFX_SCHWEIN_RIGHT : GFX_DRACHE_RIGHT);
     else if (dir == MV_UP)
       graphic = (element == EL_MOLE ? GFX_MOLE_UP :
-                element == EL_PINGUIN ? GFX_PINGUIN_UP :
-                element == EL_SCHWEIN ? GFX_SCHWEIN_UP : GFX_DRACHE_UP);
+                element == EL_PENGUIN ? GFX_PINGUIN_UP :
+                element == EL_PIG ? GFX_SCHWEIN_UP : GFX_DRACHE_UP);
     else
       graphic = (element == EL_MOLE ? GFX_MOLE_DOWN :
-                element == EL_PINGUIN ? GFX_PINGUIN_DOWN :
-                element == EL_SCHWEIN ? GFX_SCHWEIN_DOWN : GFX_DRACHE_DOWN);
+                element == EL_PENGUIN ? GFX_PINGUIN_DOWN :
+                element == EL_PIG ? GFX_SCHWEIN_DOWN : GFX_DRACHE_DOWN);
 
     graphic += phase4;
   }
-  else if (element == EL_SONDE)
+  else if (element == EL_SATELLITE)
   {
 #if 1
     graphic = GFX_SONDE_START + getGraphicAnimationPhase(8, 2, ANIM_NORMAL);
@@ -1592,7 +1592,7 @@ void DrawNewScreenElementExt(int x, int y, int dx, int dy, int element,
     graphic = (element == EL_AMOEBA_DEAD ? GFX_AMOEBE_TOT : GFX_AMOEBE_LEBT);
     graphic += (x + 2 * y + 4) % 4;
   }
-  else if (element == EL_MAUER_LEBT)
+  else if (element == EL_WALL_GROWING)
   {
     boolean links_massiv = FALSE, rechts_massiv = FALSE;
 
@@ -1608,11 +1608,11 @@ void DrawNewScreenElementExt(int x, int y, int dx, int dy, int element,
     else if (rechts_massiv)
       graphic = GFX_MAUER_L;
   }
-  else if ((element == EL_INVISIBLE_STEEL ||
+  else if ((element == EL_INVISIBLE_STEELWALL ||
            element == EL_INVISIBLE_WALL ||
            element == EL_SAND_INVISIBLE) && game.light_time_left)
   {
-    graphic = (element == EL_INVISIBLE_STEEL ? GFX_INVISIBLE_STEEL_ON :
+    graphic = (element == EL_INVISIBLE_STEELWALL ? GFX_INVISIBLE_STEEL_ON :
               element == EL_INVISIBLE_WALL ? GFX_UNSICHTBAR_ON :
               GFX_SAND_INVISIBLE_ON);
   }
@@ -1844,7 +1844,7 @@ void DrawScreenField(int x, int y)
   if (!IN_LEV_FIELD(ux, uy))
   {
     if (ux < -1 || ux > lev_fieldx || uy < -1 || uy > lev_fieldy)
-      element = EL_LEERRAUM;
+      element = EL_EMPTY;
     else
       element = BorderElement;
 
@@ -1873,7 +1873,7 @@ void DrawScreenField(int x, int y)
     if (cut_mode == CUT_ABOVE)
       DrawScreenElementShifted(x, y, 0, 0, element, NO_CUTTING);
     else
-      DrawScreenElement(x, y, EL_LEERRAUM);
+      DrawScreenElement(x, y, EL_EMPTY);
 
     if (horiz_move)
       DrawScreenElementShifted(x, y, MovPos[ux][uy], 0, element, NO_CUTTING);
@@ -1908,7 +1908,7 @@ void DrawScreenField(int x, int y)
        element_old == EL_AMOEBA_DRIPPING)
       cut_mode = CUT_ABOVE;
 
-    DrawScreenElement(x, y, EL_LEERRAUM);
+    DrawScreenElement(x, y, EL_EMPTY);
 
     if (horiz_move)
       DrawScreenElementShifted(sx, sy, MovPos[oldx][oldy], 0, element_old,
@@ -1923,7 +1923,7 @@ void DrawScreenField(int x, int y)
   else if (IS_DRAWABLE(element))
     DrawScreenElement(x, y, element);
   else
-    DrawScreenElement(x, y, EL_LEERRAUM);
+    DrawScreenElement(x, y, EL_EMPTY);
 }
 
 void DrawNewScreenField(int x, int y)
@@ -1934,7 +1934,7 @@ void DrawNewScreenField(int x, int y)
   if (!IN_LEV_FIELD(ux, uy))
   {
     if (ux < -1 || ux > lev_fieldx || uy < -1 || uy > lev_fieldy)
-      element = EL_LEERRAUM;
+      element = EL_EMPTY;
     else
       element = BorderElement;
 
@@ -1963,7 +1963,7 @@ void DrawNewScreenField(int x, int y)
     if (cut_mode == CUT_ABOVE)
       DrawNewScreenElementShifted(x, y, 0, 0, element, NO_CUTTING);
     else
-      DrawNewScreenElement(x, y, EL_LEERRAUM);
+      DrawNewScreenElement(x, y, EL_EMPTY);
 
     if (horiz_move)
       DrawNewScreenElementShifted(x, y, MovPos[ux][uy], 0, element, NO_CUTTING);
@@ -1998,7 +1998,7 @@ void DrawNewScreenField(int x, int y)
        element_old == EL_AMOEBA_DRIPPING)
       cut_mode = CUT_ABOVE;
 
-    DrawNewScreenElement(x, y, EL_LEERRAUM);
+    DrawNewScreenElement(x, y, EL_EMPTY);
 
     if (horiz_move)
       DrawNewScreenElementShifted(sx, sy, MovPos[oldx][oldy], 0, element_old,
@@ -2013,7 +2013,7 @@ void DrawNewScreenField(int x, int y)
   else if (IS_DRAWABLE(element))
     DrawNewScreenElement(x, y, element);
   else
-    DrawNewScreenElement(x, y, EL_LEERRAUM);
+    DrawNewScreenElement(x, y, EL_EMPTY);
 }
 
 void DrawLevelField(int x, int y)
@@ -2079,7 +2079,7 @@ void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
   int x = sx + scroll_x, y = sy + scroll_y;
 
   if (x < -1 || x > lev_fieldx || y < -1 || y > lev_fieldy)
-    DrawMiniElement(sx, sy, EL_LEERRAUM);
+    DrawMiniElement(sx, sy, EL_EMPTY);
   else if (x > -1 && x < lev_fieldx && y > -1 && y < lev_fieldy)
     DrawMiniElement(sx, sy, Feld[x][y]);
   else
@@ -2112,7 +2112,7 @@ void DrawMicroElement(int xpos, int ypos, int element)
 {
   int graphic;
 
-  if (element == EL_LEERRAUM)
+  if (element == EL_EMPTY)
     return;
 
   graphic = el2gfx(element);
@@ -3016,263 +3016,263 @@ int el2gfx_OLD(int element)
 {
   switch(element)
   {
-    case EL_LEERRAUM:          return -1;
-    case EL_SAND:              return GFX_ERDREICH;
-    case EL_WALL:              return GFX_MAUERWERK;
-    case EL_WALL_CRUMBLED:     return GFX_FELSBODEN;
-    case EL_ROCK:              return GFX_FELSBROCKEN;
-    case EL_KEY:               return GFX_SCHLUESSEL;
-    case EL_EMERALD:           return GFX_EDELSTEIN;
-    case EL_EXIT_CLOSED:       return GFX_AUSGANG_ZU;
-    case EL_AUSGANG_ACT:       return GFX_AUSGANG_ACT;
-    case EL_EXIT_OPEN:         return GFX_AUSGANG_AUF;
-    case EL_PLAYER:            return GFX_SPIELFIGUR;
-    case EL_SPIELER1:          return GFX_SPIELER1;
-    case EL_SPIELER2:          return GFX_SPIELER2;
-    case EL_SPIELER3:          return GFX_SPIELER3;
-    case EL_SPIELER4:          return GFX_SPIELER4;
-    case EL_BUG:               return GFX_KAEFER;
-    case EL_BUG_RIGHT:         return GFX_KAEFER_RIGHT;
-    case EL_BUG_UP:            return GFX_KAEFER_UP;
-    case EL_BUG_LEFT:          return GFX_KAEFER_LEFT;
-    case EL_BUG_DOWN:          return GFX_KAEFER_DOWN;
-    case EL_SPACESHIP:         return GFX_FLIEGER;
-    case EL_SPACESHIP_RIGHT:   return GFX_FLIEGER_RIGHT;
-    case EL_SPACESHIP_UP:      return GFX_FLIEGER_UP;
-    case EL_SPACESHIP_LEFT:    return GFX_FLIEGER_LEFT;
-    case EL_SPACESHIP_DOWN:    return GFX_FLIEGER_DOWN;
-    case EL_BUTTERFLY:         return GFX_BUTTERFLY;
-    case EL_BUTTERFLY_RIGHT:   return GFX_BUTTERFLY_RIGHT;
-    case EL_BUTTERFLY_UP:      return GFX_BUTTERFLY_UP;
-    case EL_BUTTERFLY_LEFT:    return GFX_BUTTERFLY_LEFT;
-    case EL_BUTTERFLY_DOWN:    return GFX_BUTTERFLY_DOWN;
-    case EL_FIREFLY:           return GFX_FIREFLY;
-    case EL_FIREFLY_RIGHT:     return GFX_FIREFLY_RIGHT;
-    case EL_FIREFLY_UP:                return GFX_FIREFLY_UP;
-    case EL_FIREFLY_LEFT:      return GFX_FIREFLY_LEFT;
-    case EL_FIREFLY_DOWN:      return GFX_FIREFLY_DOWN;
-    case EL_YAMYAM:            return GFX_MAMPFER;
-    case EL_ROBOT:             return GFX_ROBOT;
-    case EL_STEELWALL:         return GFX_BETON;
-    case EL_DIAMOND:           return GFX_DIAMANT;
-    case EL_QUICKSAND_EMPTY:   return GFX_MORAST_LEER;
-    case EL_QUICKSAND_FULL:    return GFX_MORAST_VOLL;
-    case EL_QUICKSAND_EMPTYING:        return GFX_MORAST_LEER;
-    case EL_AMOEBA_DROP:       return GFX_TROPFEN;
-    case EL_BOMB:              return GFX_BOMBE;
-    case EL_MAGIC_WALL:                return GFX_MAGIC_WALL_OFF;
-    case EL_MAGIC_WALL_EMPTY:  return GFX_MAGIC_WALL_EMPTY;
-    case EL_MAGIC_WALL_EMPTYING:return GFX_MAGIC_WALL_EMPTY;
-    case EL_MAGIC_WALL_FULL:   return GFX_MAGIC_WALL_FULL;
-    case EL_MAGIC_WALL_DEAD:   return GFX_MAGIC_WALL_DEAD;
-    case EL_ACID:              return GFX_SALZSAEURE;
-    case EL_AMOEBA_DEAD:       return GFX_AMOEBE_TOT;
-    case EL_AMOEBA_WET:                return GFX_AMOEBE_NASS;
-    case EL_AMOEBA_DRY:                return GFX_AMOEBE_NORM;
-    case EL_AMOEBA_FULL:       return GFX_AMOEBE_VOLL;
-    case EL_BD_AMOEBA:         return GFX_AMOEBE_BD;
-    case EL_AMOEBA2DIAM:       return GFX_AMOEBA2DIAM;
-    case EL_AMOEBA_DRIPPING:   return GFX_AMOEBE_NASS;
-    case EL_NUT:               return GFX_KOKOSNUSS;
-    case EL_GAMEOFLIFE:                return GFX_LIFE;
-    case EL_BIOMAZE:           return GFX_LIFE_ASYNC;
-    case EL_DYNAMITE_ACTIVE:   return GFX_DYNAMIT;
-    case EL_BADEWANNE:         return GFX_BADEWANNE;
-    case EL_ACIDPOOL_TOPLEFT:  return GFX_BADEWANNE1;
-    case EL_ACIDPOOL_TOPRIGHT: return GFX_BADEWANNE2;
-    case EL_ACIDPOOL_BOTTOMLEFT:return GFX_BADEWANNE3;
-    case EL_ACIDPOOL_BOTTOM:   return GFX_BADEWANNE4;
-    case EL_ACIDPOOL_BOTTOMRIGHT:return GFX_BADEWANNE5;
-    case EL_ROBOT_WHEEL:       return GFX_ABLENK_AUS;
-    case EL_ROBOT_WHEEL_ACTIVE:        return GFX_ABLENK_EIN;
-    case EL_KEY1:              return GFX_SCHLUESSEL1;
-    case EL_KEY2:              return GFX_SCHLUESSEL2;
-    case EL_KEY3:              return GFX_SCHLUESSEL3;
-    case EL_KEY4:              return GFX_SCHLUESSEL4;
-    case EL_GATE1:             return GFX_PFORTE1;
-    case EL_GATE2:             return GFX_PFORTE2;
-    case EL_GATE3:             return GFX_PFORTE3;
-    case EL_GATE4:             return GFX_PFORTE4;
-    case EL_GATE1X:            return GFX_PFORTE1X;
-    case EL_GATE2X:            return GFX_PFORTE2X;
-    case EL_GATE3X:            return GFX_PFORTE3X;
-    case EL_GATE4X:            return GFX_PFORTE4X;
-    case EL_DYNAMITE:          return GFX_DYNAMIT_AUS;
-    case EL_PACMAN:            return GFX_PACMAN;
-    case EL_PACMAN_RIGHT:      return GFX_PACMAN_RIGHT;
-    case EL_PACMAN_UP:         return GFX_PACMAN_UP;
-    case EL_PACMAN_LEFT:       return GFX_PACMAN_LEFT;
-    case EL_PACMAN_DOWN:       return GFX_PACMAN_DOWN;
-    case EL_INVISIBLE_WALL:    return GFX_UNSICHTBAR;
-    case EL_WALL_EDEL:         return GFX_ERZ_EDEL;
-    case EL_WALL_DIAMOND:      return GFX_ERZ_DIAM;
-    case EL_LAMP:              return GFX_BIRNE_AUS;
-    case EL_LAMP_ACTIVE:       return GFX_BIRNE_EIN;
-    case EL_TIME_ORB_FULL:     return GFX_ZEIT_VOLL;
-    case EL_TIME_ORB_EMPTY:    return GFX_ZEIT_LEER;
-    case EL_MAUER_LEBT:                return GFX_MAUER_LEBT;
-    case EL_MAUER_X:           return GFX_MAUER_X;
-    case EL_MAUER_Y:           return GFX_MAUER_Y;
-    case EL_MAUER_XY:          return GFX_MAUER_XY;
-    case EL_EMERALD_BD:                return GFX_EDELSTEIN_BD;
-    case EL_EMERALD_YELLOW:    return GFX_EDELSTEIN_GELB;
-    case EL_EMERALD_RED:       return GFX_EDELSTEIN_ROT;
-    case EL_EMERALD_PURPLE:    return GFX_EDELSTEIN_LILA;
-    case EL_WALL_BD_DIAMOND:   return GFX_ERZ_EDEL_BD;
-    case EL_WALL_EDEL_YELLOW:  return GFX_ERZ_EDEL_GELB;
-    case EL_WALL_EDEL_RED:     return GFX_ERZ_EDEL_ROT;
-    case EL_WALL_EDEL_PURPLE:  return GFX_ERZ_EDEL_LILA;
-    case EL_DARK_YAMYAM:       return GFX_MAMPFER2;
-    case EL_MAGIC_WALL_BD_OFF: return GFX_MAGIC_WALL_BD_OFF;
-    case EL_MAGIC_WALL_BD_EMPTY:return GFX_MAGIC_WALL_BD_EMPTY;
-    case EL_MAGIC_WALL_BD_EMPTYING:return GFX_MAGIC_WALL_BD_EMPTY;
-    case EL_MAGIC_WALL_BD_FULL:        return GFX_MAGIC_WALL_BD_FULL;
-    case EL_MAGIC_WALL_BD_DEAD:        return GFX_MAGIC_WALL_BD_DEAD;
-    case EL_DYNABOMB_ACTIVE_1: return GFX_DYNABOMB;
-    case EL_DYNABOMB_ACTIVE_2: return GFX_DYNABOMB;
-    case EL_DYNABOMB_ACTIVE_3: return GFX_DYNABOMB;
-    case EL_DYNABOMB_ACTIVE_4: return GFX_DYNABOMB;
-    case EL_DYNABOMB_NR:       return GFX_DYNABOMB_NR;
-    case EL_DYNABOMB_SZ:       return GFX_DYNABOMB_SZ;
-    case EL_DYNABOMB_XL:       return GFX_DYNABOMB_XL;
-    case EL_SOKOBAN_OBJEKT:    return GFX_SOKOBAN_OBJEKT;
-    case EL_SOKOBAN_FELD_LEER: return GFX_SOKOBAN_FELD_LEER;
-    case EL_SOKOBAN_FELD_VOLL: return GFX_SOKOBAN_FELD_VOLL;
-    case EL_MOLE:              return GFX_MOLE;
-    case EL_PINGUIN:           return GFX_PINGUIN;
-    case EL_SCHWEIN:           return GFX_SCHWEIN;
-    case EL_DRACHE:            return GFX_DRACHE;
-    case EL_SONDE:             return GFX_SONDE;
-    case EL_PFEIL_LEFT:                return GFX_PFEIL_LEFT;
-    case EL_PFEIL_RIGHT:       return GFX_PFEIL_RIGHT;
-    case EL_PFEIL_UP:          return GFX_PFEIL_UP;
-    case EL_PFEIL_DOWN:                return GFX_PFEIL_DOWN;
-    case EL_SPEED_PILL:                return GFX_SPEED_PILL;
-    case EL_SP_TERMINAL_ACTIVE:        return GFX_SP_TERMINAL;
-    case EL_SP_BUG_ACTIVE:     return GFX_SP_BUG_ACTIVE;
-    case EL_SP_ZONK:           return GFX_SP_ZONK;
+    case EL_EMPTY:                     return -1;
+    case EL_SAND:                      return GFX_ERDREICH;
+    case EL_WALL:                      return GFX_MAUERWERK;
+    case EL_WALL_CRUMBLED:             return GFX_FELSBODEN;
+    case EL_ROCK:                      return GFX_FELSBROCKEN;
+    case EL_KEY:                       return GFX_SCHLUESSEL;
+    case EL_EMERALD:                   return GFX_EDELSTEIN;
+    case EL_EXIT_CLOSED:               return GFX_AUSGANG_ZU;
+    case EL_AUSGANG_ACT:               return GFX_AUSGANG_ACT;
+    case EL_EXIT_OPEN:                 return GFX_AUSGANG_AUF;
+    case EL_PLAYER:                    return GFX_SPIELFIGUR;
+    case EL_PLAYER1:                   return GFX_SPIELER1;
+    case EL_PLAYER2:                   return GFX_SPIELER2;
+    case EL_PLAYER3:                   return GFX_SPIELER3;
+    case EL_PLAYER4:                   return GFX_SPIELER4;
+    case EL_BUG:                       return GFX_KAEFER;
+    case EL_BUG_RIGHT:                 return GFX_KAEFER_RIGHT;
+    case EL_BUG_UP:                    return GFX_KAEFER_UP;
+    case EL_BUG_LEFT:                  return GFX_KAEFER_LEFT;
+    case EL_BUG_DOWN:                  return GFX_KAEFER_DOWN;
+    case EL_SPACESHIP:                 return GFX_FLIEGER;
+    case EL_SPACESHIP_RIGHT:           return GFX_FLIEGER_RIGHT;
+    case EL_SPACESHIP_UP:              return GFX_FLIEGER_UP;
+    case EL_SPACESHIP_LEFT:            return GFX_FLIEGER_LEFT;
+    case EL_SPACESHIP_DOWN:            return GFX_FLIEGER_DOWN;
+    case EL_BUTTERFLY:                 return GFX_BUTTERFLY;
+    case EL_BUTTERFLY_RIGHT:           return GFX_BUTTERFLY_RIGHT;
+    case EL_BUTTERFLY_UP:              return GFX_BUTTERFLY_UP;
+    case EL_BUTTERFLY_LEFT:            return GFX_BUTTERFLY_LEFT;
+    case EL_BUTTERFLY_DOWN:            return GFX_BUTTERFLY_DOWN;
+    case EL_FIREFLY:                   return GFX_FIREFLY;
+    case EL_FIREFLY_RIGHT:             return GFX_FIREFLY_RIGHT;
+    case EL_FIREFLY_UP:                        return GFX_FIREFLY_UP;
+    case EL_FIREFLY_LEFT:              return GFX_FIREFLY_LEFT;
+    case EL_FIREFLY_DOWN:              return GFX_FIREFLY_DOWN;
+    case EL_YAMYAM:                    return GFX_MAMPFER;
+    case EL_ROBOT:                     return GFX_ROBOT;
+    case EL_STEELWALL:                 return GFX_BETON;
+    case EL_DIAMOND:                   return GFX_DIAMANT;
+    case EL_QUICKSAND_EMPTY:           return GFX_MORAST_LEER;
+    case EL_QUICKSAND_FULL:            return GFX_MORAST_VOLL;
+    case EL_QUICKSAND_EMPTYING:                return GFX_MORAST_LEER;
+    case EL_AMOEBA_DROP:               return GFX_TROPFEN;
+    case EL_BOMB:                      return GFX_BOMBE;
+    case EL_MAGIC_WALL:                        return GFX_MAGIC_WALL_OFF;
+    case EL_MAGIC_WALL_EMPTY:          return GFX_MAGIC_WALL_EMPTY;
+    case EL_MAGIC_WALL_EMPTYING:       return GFX_MAGIC_WALL_EMPTY;
+    case EL_MAGIC_WALL_FULL:           return GFX_MAGIC_WALL_FULL;
+    case EL_MAGIC_WALL_DEAD:           return GFX_MAGIC_WALL_DEAD;
+    case EL_ACID:                      return GFX_SALZSAEURE;
+    case EL_AMOEBA_DEAD:               return GFX_AMOEBE_TOT;
+    case EL_AMOEBA_WET:                        return GFX_AMOEBE_NASS;
+    case EL_AMOEBA_DRY:                        return GFX_AMOEBE_NORM;
+    case EL_AMOEBA_FULL:               return GFX_AMOEBE_VOLL;
+    case EL_BD_AMOEBA:                 return GFX_AMOEBE_BD;
+    case EL_AMOEBA_TO_DIAMOND:         return GFX_AMOEBA2DIAM;
+    case EL_AMOEBA_DRIPPING:           return GFX_AMOEBE_NASS;
+    case EL_NUT:                       return GFX_KOKOSNUSS;
+    case EL_GAMEOFLIFE:                        return GFX_LIFE;
+    case EL_BIOMAZE:                   return GFX_LIFE_ASYNC;
+    case EL_DYNAMITE_ACTIVE:           return GFX_DYNAMIT;
+    case EL_STONEBLOCK:                        return GFX_BADEWANNE;
+    case EL_ACIDPOOL_TOPLEFT:          return GFX_BADEWANNE1;
+    case EL_ACIDPOOL_TOPRIGHT:         return GFX_BADEWANNE2;
+    case EL_ACIDPOOL_BOTTOMLEFT:       return GFX_BADEWANNE3;
+    case EL_ACIDPOOL_BOTTOM:           return GFX_BADEWANNE4;
+    case EL_ACIDPOOL_BOTTOMRIGHT:      return GFX_BADEWANNE5;
+    case EL_ROBOT_WHEEL:               return GFX_ABLENK_AUS;
+    case EL_ROBOT_WHEEL_ACTIVE:                return GFX_ABLENK_EIN;
+    case EL_KEY1:                      return GFX_SCHLUESSEL1;
+    case EL_KEY2:                      return GFX_SCHLUESSEL2;
+    case EL_KEY3:                      return GFX_SCHLUESSEL3;
+    case EL_KEY4:                      return GFX_SCHLUESSEL4;
+    case EL_GATE1:                     return GFX_PFORTE1;
+    case EL_GATE2:                     return GFX_PFORTE2;
+    case EL_GATE3:                     return GFX_PFORTE3;
+    case EL_GATE4:                     return GFX_PFORTE4;
+    case EL_GATE1_GRAY:                        return GFX_PFORTE1X;
+    case EL_GATE2_GRAY:                        return GFX_PFORTE2X;
+    case EL_GATE3_GRAY:                        return GFX_PFORTE3X;
+    case EL_GATE4_GRAY:                        return GFX_PFORTE4X;
+    case EL_DYNAMITE:                  return GFX_DYNAMIT_AUS;
+    case EL_PACMAN:                    return GFX_PACMAN;
+    case EL_PACMAN_RIGHT:              return GFX_PACMAN_RIGHT;
+    case EL_PACMAN_UP:                 return GFX_PACMAN_UP;
+    case EL_PACMAN_LEFT:               return GFX_PACMAN_LEFT;
+    case EL_PACMAN_DOWN:               return GFX_PACMAN_DOWN;
+    case EL_INVISIBLE_WALL:            return GFX_UNSICHTBAR;
+    case EL_WALL_EMERALD:              return GFX_ERZ_EDEL;
+    case EL_WALL_DIAMOND:              return GFX_ERZ_DIAM;
+    case EL_LAMP:                      return GFX_BIRNE_AUS;
+    case EL_LAMP_ACTIVE:               return GFX_BIRNE_EIN;
+    case EL_TIME_ORB_FULL:             return GFX_ZEIT_VOLL;
+    case EL_TIME_ORB_EMPTY:            return GFX_ZEIT_LEER;
+    case EL_WALL_GROWING:              return GFX_MAUER_LEBT;
+    case EL_WALL_GROWING_X:            return GFX_MAUER_X;
+    case EL_WALL_GROWING_Y:            return GFX_MAUER_Y;
+    case EL_WALL_GROWING_XY:           return GFX_MAUER_XY;
+    case EL_BD_DIAMOND:                        return GFX_EDELSTEIN_BD;
+    case EL_EMERALD_YELLOW:            return GFX_EDELSTEIN_GELB;
+    case EL_EMERALD_RED:               return GFX_EDELSTEIN_ROT;
+    case EL_EMERALD_PURPLE:            return GFX_EDELSTEIN_LILA;
+    case EL_WALL_BD_DIAMOND:           return GFX_ERZ_EDEL_BD;
+    case EL_WALL_EMERALD_YELLOW:       return GFX_ERZ_EDEL_GELB;
+    case EL_WALL_EMERALD_RED:          return GFX_ERZ_EDEL_ROT;
+    case EL_WALL_EMERALD_PURPLE:       return GFX_ERZ_EDEL_LILA;
+    case EL_DARK_YAMYAM:               return GFX_MAMPFER2;
+    case EL_MAGIC_WALL_BD_OFF:         return GFX_MAGIC_WALL_BD_OFF;
+    case EL_MAGIC_WALL_BD_EMPTY:       return GFX_MAGIC_WALL_BD_EMPTY;
+    case EL_MAGIC_WALL_BD_EMPTYING:    return GFX_MAGIC_WALL_BD_EMPTY;
+    case EL_MAGIC_WALL_BD_FULL:                return GFX_MAGIC_WALL_BD_FULL;
+    case EL_MAGIC_WALL_BD_DEAD:                return GFX_MAGIC_WALL_BD_DEAD;
+    case EL_DYNABOMB_ACTIVE_1:         return GFX_DYNABOMB;
+    case EL_DYNABOMB_ACTIVE_2:         return GFX_DYNABOMB;
+    case EL_DYNABOMB_ACTIVE_3:         return GFX_DYNABOMB;
+    case EL_DYNABOMB_ACTIVE_4:         return GFX_DYNABOMB;
+    case EL_DYNABOMB_NR:               return GFX_DYNABOMB_NR;
+    case EL_DYNABOMB_SZ:               return GFX_DYNABOMB_SZ;
+    case EL_DYNABOMB_XL:               return GFX_DYNABOMB_XL;
+    case EL_SOKOBAN_OBJEKT:            return GFX_SOKOBAN_OBJEKT;
+    case EL_SOKOBAN_FELD_LEER:         return GFX_SOKOBAN_FELD_LEER;
+    case EL_SOKOBAN_FELD_VOLL:         return GFX_SOKOBAN_FELD_VOLL;
+    case EL_MOLE:                      return GFX_MOLE;
+    case EL_PENGUIN:                   return GFX_PINGUIN;
+    case EL_PIG:                       return GFX_SCHWEIN;
+    case EL_DRAGON:                    return GFX_DRACHE;
+    case EL_SATELLITE:                 return GFX_SONDE;
+    case EL_ARROW_LEFT:                        return GFX_PFEIL_LEFT;
+    case EL_ARROW_RIGHT:               return GFX_PFEIL_RIGHT;
+    case EL_ARROW_UP:                  return GFX_PFEIL_UP;
+    case EL_ARROW_DOWN:                        return GFX_PFEIL_DOWN;
+    case EL_SPEED_PILL:                        return GFX_SPEED_PILL;
+    case EL_SP_TERMINAL_ACTIVE:                return GFX_SP_TERMINAL;
+    case EL_SP_BUG_ACTIVE:             return GFX_SP_BUG_ACTIVE;
+    case EL_SP_ZONK:                   return GFX_SP_ZONK;
       /* ^^^^^^^^^^ non-standard position in supaplex graphic set! */
-    case EL_INVISIBLE_STEEL:   return GFX_INVISIBLE_STEEL;
-    case EL_BLACK_ORB:         return GFX_BLACK_ORB;
-    case EL_EM_GATE1:          return GFX_EM_GATE_1;
-    case EL_EM_GATE2:          return GFX_EM_GATE_2;
-    case EL_EM_GATE3:          return GFX_EM_GATE_3;
-    case EL_EM_GATE4:          return GFX_EM_GATE_4;
-    case EL_EM_GATE1_GRAY:     return GFX_EM_GATE_1X;
-    case EL_EM_GATE2_GRAY:     return GFX_EM_GATE_2X;
-    case EL_EM_GATE3_GRAY:     return GFX_EM_GATE_3X;
-    case EL_EM_GATE4_GRAY:     return GFX_EM_GATE_4X;
-    case EL_EM_KEY_1_FILE:     return GFX_EM_KEY_1;
-    case EL_EM_KEY_2_FILE:     return GFX_EM_KEY_2;
-    case EL_EM_KEY_3_FILE:     return GFX_EM_KEY_3;
-    case EL_EM_KEY_4_FILE:     return GFX_EM_KEY_4;
-    case EL_EM_KEY_1:          return GFX_EM_KEY_1;
-    case EL_EM_KEY_2:          return GFX_EM_KEY_2;
-    case EL_EM_KEY_3:          return GFX_EM_KEY_3;
-    case EL_EM_KEY_4:          return GFX_EM_KEY_4;
-    case EL_PEARL:             return GFX_PEARL;
-    case EL_CRYSTAL:           return GFX_CRYSTAL;
-    case EL_WALL_PEARL:                return GFX_WALL_PEARL;
-    case EL_WALL_CRYSTAL:      return GFX_WALL_CRYSTAL;
-    case EL_DOOR_WHITE:                return GFX_DOOR_WHITE;
-    case EL_DOOR_WHITE_GRAY:   return GFX_DOOR_WHITE_GRAY;
-    case EL_KEY_WHITE:         return GFX_KEY_WHITE;
-    case EL_SHIELD_PASSIVE:    return GFX_SHIELD_PASSIVE;
-    case EL_SHIELD_ACTIVE:     return GFX_SHIELD_ACTIVE;
-    case EL_EXTRA_TIME:                return GFX_EXTRA_TIME;
-    case EL_SWITCHGATE_OPEN:   return GFX_SWITCHGATE_OPEN;
-    case EL_SWITCHGATE_CLOSED: return GFX_SWITCHGATE_CLOSED;
-    case EL_SWITCHGATE_SWITCH_1:return GFX_SWITCHGATE_SWITCH_1;
-    case EL_SWITCHGATE_SWITCH_2:return GFX_SWITCHGATE_SWITCH_2;
-    case EL_BELT1_LEFT:                return GFX_BELT1_LEFT;
-    case EL_BELT1_MIDDLE:      return GFX_BELT1_MIDDLE;
-    case EL_BELT1_RIGHT:       return GFX_BELT1_RIGHT;
-    case EL_BELT1_SWITCH_LEFT: return GFX_BELT1_SWITCH_LEFT;
-    case EL_BELT1_SWITCH_MIDDLE:return GFX_BELT1_SWITCH_MIDDLE;
-    case EL_BELT1_SWITCH_RIGHT:        return GFX_BELT1_SWITCH_RIGHT;
-    case EL_BELT2_LEFT:                return GFX_BELT2_LEFT;
-    case EL_BELT2_MIDDLE:      return GFX_BELT2_MIDDLE;
-    case EL_BELT2_RIGHT:       return GFX_BELT2_RIGHT;
-    case EL_BELT2_SWITCH_LEFT: return GFX_BELT2_SWITCH_LEFT;
-    case EL_BELT2_SWITCH_MIDDLE:return GFX_BELT2_SWITCH_MIDDLE;
-    case EL_BELT2_SWITCH_RIGHT:        return GFX_BELT2_SWITCH_RIGHT;
-    case EL_BELT3_LEFT:                return GFX_BELT3_LEFT;
-    case EL_BELT3_MIDDLE:      return GFX_BELT3_MIDDLE;
-    case EL_BELT3_RIGHT:       return GFX_BELT3_RIGHT;
-    case EL_BELT3_SWITCH_LEFT: return GFX_BELT3_SWITCH_LEFT;
-    case EL_BELT3_SWITCH_MIDDLE:return GFX_BELT3_SWITCH_MIDDLE;
-    case EL_BELT3_SWITCH_RIGHT:        return GFX_BELT3_SWITCH_RIGHT;
-    case EL_BELT4_LEFT:                return GFX_BELT4_LEFT;
-    case EL_BELT4_MIDDLE:      return GFX_BELT4_MIDDLE;
-    case EL_BELT4_RIGHT:       return GFX_BELT4_RIGHT;
-    case EL_BELT4_SWITCH_LEFT: return GFX_BELT4_SWITCH_LEFT;
-    case EL_BELT4_SWITCH_MIDDLE:return GFX_BELT4_SWITCH_MIDDLE;
-    case EL_BELT4_SWITCH_RIGHT:        return GFX_BELT4_SWITCH_RIGHT;
-    case EL_LANDMINE:          return GFX_LANDMINE;
-    case EL_ENVELOPE:          return GFX_ENVELOPE;
-    case EL_LIGHT_SWITCH_OFF:  return GFX_LIGHT_SWITCH_OFF;
-    case EL_LIGHT_SWITCH_ON:   return GFX_LIGHT_SWITCH_ON;
-    case EL_SIGN_EXCLAMATION:  return GFX_SIGN_EXCLAMATION;
-    case EL_SIGN_RADIOACTIVITY:        return GFX_SIGN_RADIOACTIVITY;
-    case EL_SIGN_STOP:         return GFX_SIGN_STOP;
-    case EL_SIGN_WHEELCHAIR:   return GFX_SIGN_WHEELCHAIR;
-    case EL_SIGN_PARKING:      return GFX_SIGN_PARKING;
-    case EL_SIGN_ONEWAY:       return GFX_SIGN_ONEWAY;
-    case EL_SIGN_HEART:                return GFX_SIGN_HEART;
-    case EL_SIGN_TRIANGLE:     return GFX_SIGN_TRIANGLE;
-    case EL_SIGN_ROUND:                return GFX_SIGN_ROUND;
-    case EL_SIGN_EXIT:         return GFX_SIGN_EXIT;
-    case EL_SIGN_YINYANG:      return GFX_SIGN_YINYANG;
-    case EL_SIGN_OTHER:                return GFX_SIGN_OTHER;
-    case EL_MOLE_LEFT:         return GFX_MOLE_LEFT;
-    case EL_MOLE_RIGHT:                return GFX_MOLE_RIGHT;
-    case EL_MOLE_UP:           return GFX_MOLE_UP;
-    case EL_MOLE_DOWN:         return GFX_MOLE_DOWN;
-    case EL_STEEL_SLANTED:     return GFX_STEEL_SLANTED;
-    case EL_SAND_INVISIBLE:    return GFX_SAND_INVISIBLE;
-    case EL_DX_UNKNOWN_15:     return GFX_DX_UNKNOWN_15;
-    case EL_DX_UNKNOWN_42:     return GFX_DX_UNKNOWN_42;
-    case EL_TIMEGATE_OPEN:     return GFX_TIMEGATE_OPEN;
-    case EL_TIMEGATE_CLOSED:   return GFX_TIMEGATE_CLOSED;
-    case EL_TIMEGATE_SWITCH_ON:        return GFX_TIMEGATE_SWITCH;
-    case EL_TIMEGATE_SWITCH_OFF:return GFX_TIMEGATE_SWITCH;
-    case EL_BALLOON:           return GFX_BALLOON;
-    case EL_BALLOON_SEND_LEFT: return GFX_BALLOON_SEND_LEFT;
-    case EL_BALLOON_SEND_RIGHT:        return GFX_BALLOON_SEND_RIGHT;
-    case EL_BALLOON_SEND_UP:   return GFX_BALLOON_SEND_UP;
-    case EL_BALLOON_SEND_DOWN: return GFX_BALLOON_SEND_DOWN;
-    case EL_BALLOON_SEND_ANY:  return GFX_BALLOON_SEND_ANY;
-    case EL_EMC_STEEL_WALL_1:  return GFX_EMC_STEEL_WALL_1;
-    case EL_EMC_STEEL_WALL_2:  return GFX_EMC_STEEL_WALL_2;
-    case EL_EMC_STEEL_WALL_3:  return GFX_EMC_STEEL_WALL_3;
-    case EL_EMC_STEEL_WALL_4:  return GFX_EMC_STEEL_WALL_4;
-    case EL_EMC_WALL_1:                return GFX_EMC_WALL_1;
-    case EL_EMC_WALL_2:                return GFX_EMC_WALL_2;
-    case EL_EMC_WALL_3:                return GFX_EMC_WALL_3;
-    case EL_EMC_WALL_4:                return GFX_EMC_WALL_4;
-    case EL_EMC_WALL_5:                return GFX_EMC_WALL_5;
-    case EL_EMC_WALL_6:                return GFX_EMC_WALL_6;
-    case EL_EMC_WALL_7:                return GFX_EMC_WALL_7;
-    case EL_EMC_WALL_8:                return GFX_EMC_WALL_8;
-    case EL_TUBE_CROSS:                return GFX_TUBE_CROSS;
-    case EL_TUBE_VERTICAL:     return GFX_TUBE_VERTICAL;
-    case EL_TUBE_HORIZONTAL:   return GFX_TUBE_HORIZONTAL;
-    case EL_TUBE_VERT_LEFT:    return GFX_TUBE_VERT_LEFT;
-    case EL_TUBE_VERT_RIGHT:   return GFX_TUBE_VERT_RIGHT;
-    case EL_TUBE_HORIZ_UP:     return GFX_TUBE_HORIZ_UP;
-    case EL_TUBE_HORIZ_DOWN:   return GFX_TUBE_HORIZ_DOWN;
-    case EL_TUBE_LEFT_UP:      return GFX_TUBE_LEFT_UP;
-    case EL_TUBE_LEFT_DOWN:    return GFX_TUBE_LEFT_DOWN;
-    case EL_TUBE_RIGHT_UP:     return GFX_TUBE_RIGHT_UP;
-    case EL_TUBE_RIGHT_DOWN:   return GFX_TUBE_RIGHT_DOWN;
-    case EL_SPRING:            return GFX_SPRING;
-    case EL_SPRING_MOVING:     return GFX_SPRING;
-    case EL_TRAP_INACTIVE:     return GFX_TRAP_INACTIVE;
-    case EL_TRAP_ACTIVE:       return GFX_TRAP_ACTIVE;
-    case EL_BD_WALL:           return GFX_BD_WALL;
-    case EL_BD_ROCK:           return GFX_BD_ROCK;
-    case EL_DX_SUPABOMB:       return GFX_DX_SUPABOMB;
-    case EL_SP_MURPHY_CLONE:   return GFX_SP_MURPHY_CLONE;
+    case EL_INVISIBLE_STEELWALL:       return GFX_INVISIBLE_STEEL;
+    case EL_BLACK_ORB:                 return GFX_BLACK_ORB;
+    case EL_EM_GATE1:                  return GFX_EM_GATE_1;
+    case EL_EM_GATE2:                  return GFX_EM_GATE_2;
+    case EL_EM_GATE3:                  return GFX_EM_GATE_3;
+    case EL_EM_GATE4:                  return GFX_EM_GATE_4;
+    case EL_EM_GATE1_GRAY:             return GFX_EM_GATE_1X;
+    case EL_EM_GATE2_GRAY:             return GFX_EM_GATE_2X;
+    case EL_EM_GATE3_GRAY:             return GFX_EM_GATE_3X;
+    case EL_EM_GATE4_GRAY:             return GFX_EM_GATE_4X;
+    case EL_EM_KEY1_FILE:              return GFX_EM_KEY_1;
+    case EL_EM_KEY2_FILE:              return GFX_EM_KEY_2;
+    case EL_EM_KEY3_FILE:              return GFX_EM_KEY_3;
+    case EL_EM_KEY4_FILE:              return GFX_EM_KEY_4;
+    case EL_EM_KEY1:                   return GFX_EM_KEY_1;
+    case EL_EM_KEY2:                   return GFX_EM_KEY_2;
+    case EL_EM_KEY3:                   return GFX_EM_KEY_3;
+    case EL_EM_KEY4:                   return GFX_EM_KEY_4;
+    case EL_PEARL:                     return GFX_PEARL;
+    case EL_CRYSTAL:                   return GFX_CRYSTAL;
+    case EL_WALL_PEARL:                        return GFX_WALL_PEARL;
+    case EL_WALL_CRYSTAL:              return GFX_WALL_CRYSTAL;
+    case EL_DOOR_WHITE:                        return GFX_DOOR_WHITE;
+    case EL_DOOR_WHITE_GRAY:           return GFX_DOOR_WHITE_GRAY;
+    case EL_KEY_WHITE:                 return GFX_KEY_WHITE;
+    case EL_SHIELD_NORMAL:             return GFX_SHIELD_PASSIVE;
+    case EL_SHIELD_ACTIVE:             return GFX_SHIELD_ACTIVE;
+    case EL_EXTRA_TIME:                        return GFX_EXTRA_TIME;
+    case EL_SWITCHGATE_OPEN:           return GFX_SWITCHGATE_OPEN;
+    case EL_SWITCHGATE_CLOSED:         return GFX_SWITCHGATE_CLOSED;
+    case EL_SWITCHGATE_SWITCH_UP:      return GFX_SWITCHGATE_SWITCH_1;
+    case EL_SWITCHGATE_SWITCH_DOWN:    return GFX_SWITCHGATE_SWITCH_2;
+    case EL_CONVEYOR_BELT1_LEFT:       return GFX_BELT1_LEFT;
+    case EL_CONVEYOR_BELT1_MIDDLE:     return GFX_BELT1_MIDDLE;
+    case EL_CONVEYOR_BELT1_RIGHT:      return GFX_BELT1_RIGHT;
+    case EL_CONVEYOR_BELT1_SWITCH_LEFT:        return GFX_BELT1_SWITCH_LEFT;
+    case EL_CONVEYOR_BELT1_SWITCH_MIDDLE:return GFX_BELT1_SWITCH_MIDDLE;
+    case EL_CONVEYOR_BELT1_SWITCH_RIGHT:return GFX_BELT1_SWITCH_RIGHT;
+    case EL_CONVEYOR_BELT2_LEFT:       return GFX_BELT2_LEFT;
+    case EL_CONVEYOR_BELT2_MIDDLE:     return GFX_BELT2_MIDDLE;
+    case EL_CONVEYOR_BELT2_RIGHT:      return GFX_BELT2_RIGHT;
+    case EL_CONVEYOR_BELT2_SWITCH_LEFT:        return GFX_BELT2_SWITCH_LEFT;
+    case EL_CONVEYOR_BELT2_SWITCH_MIDDLE:return GFX_BELT2_SWITCH_MIDDLE;
+    case EL_CONVEYOR_BELT2_SWITCH_RIGHT:return GFX_BELT2_SWITCH_RIGHT;
+    case EL_CONVEYOR_BELT3_LEFT:       return GFX_BELT3_LEFT;
+    case EL_CONVEYOR_BELT3_MIDDLE:     return GFX_BELT3_MIDDLE;
+    case EL_CONVEYOR_BELT3_RIGHT:      return GFX_BELT3_RIGHT;
+    case EL_CONVEYOR_BELT3_SWITCH_LEFT:        return GFX_BELT3_SWITCH_LEFT;
+    case EL_CONVEYOR_BELT3_SWITCH_MIDDLE:return GFX_BELT3_SWITCH_MIDDLE;
+    case EL_CONVEYOR_BELT3_SWITCH_RIGHT:return GFX_BELT3_SWITCH_RIGHT;
+    case EL_CONVEYOR_BELT4_LEFT:       return GFX_BELT4_LEFT;
+    case EL_CONVEYOR_BELT4_MIDDLE:     return GFX_BELT4_MIDDLE;
+    case EL_CONVEYOR_BELT4_RIGHT:      return GFX_BELT4_RIGHT;
+    case EL_CONVEYOR_BELT4_SWITCH_LEFT:        return GFX_BELT4_SWITCH_LEFT;
+    case EL_CONVEYOR_BELT4_SWITCH_MIDDLE:return GFX_BELT4_SWITCH_MIDDLE;
+    case EL_CONVEYOR_BELT4_SWITCH_RIGHT:return GFX_BELT4_SWITCH_RIGHT;
+    case EL_LANDMINE:                  return GFX_LANDMINE;
+    case EL_ENVELOPE:                  return GFX_ENVELOPE;
+    case EL_LIGHT_SWITCH:              return GFX_LIGHT_SWITCH_OFF;
+    case EL_LIGHT_SWITCH_ACTIVE:       return GFX_LIGHT_SWITCH_ON;
+    case EL_SIGN_EXCLAMATION:          return GFX_SIGN_EXCLAMATION;
+    case EL_SIGN_RADIOACTIVITY:                return GFX_SIGN_RADIOACTIVITY;
+    case EL_SIGN_STOP:                 return GFX_SIGN_STOP;
+    case EL_SIGN_WHEELCHAIR:           return GFX_SIGN_WHEELCHAIR;
+    case EL_SIGN_PARKING:              return GFX_SIGN_PARKING;
+    case EL_SIGN_ONEWAY:               return GFX_SIGN_ONEWAY;
+    case EL_SIGN_HEART:                        return GFX_SIGN_HEART;
+    case EL_SIGN_TRIANGLE:             return GFX_SIGN_TRIANGLE;
+    case EL_SIGN_ROUND:                        return GFX_SIGN_ROUND;
+    case EL_SIGN_EXIT:                 return GFX_SIGN_EXIT;
+    case EL_SIGN_YINYANG:              return GFX_SIGN_YINYANG;
+    case EL_SIGN_OTHER:                        return GFX_SIGN_OTHER;
+    case EL_MOLE_LEFT:                 return GFX_MOLE_LEFT;
+    case EL_MOLE_RIGHT:                        return GFX_MOLE_RIGHT;
+    case EL_MOLE_UP:                   return GFX_MOLE_UP;
+    case EL_MOLE_DOWN:                 return GFX_MOLE_DOWN;
+    case EL_STEELWALL_SLANTED:         return GFX_STEEL_SLANTED;
+    case EL_SAND_INVISIBLE:            return GFX_SAND_INVISIBLE;
+    case EL_DX_UNKNOWN_15:             return GFX_DX_UNKNOWN_15;
+    case EL_DX_UNKNOWN_42:             return GFX_DX_UNKNOWN_42;
+    case EL_TIMEGATE_OPEN:             return GFX_TIMEGATE_OPEN;
+    case EL_TIMEGATE_CLOSED:           return GFX_TIMEGATE_CLOSED;
+    case EL_TIMEGATE_SWITCH_ON:                return GFX_TIMEGATE_SWITCH;
+    case EL_TIMEGATE_SWITCH_OFF:       return GFX_TIMEGATE_SWITCH;
+    case EL_BALLOON:                   return GFX_BALLOON;
+    case EL_BALLOON_SEND_LEFT:         return GFX_BALLOON_SEND_LEFT;
+    case EL_BALLOON_SEND_RIGHT:                return GFX_BALLOON_SEND_RIGHT;
+    case EL_BALLOON_SEND_UP:           return GFX_BALLOON_SEND_UP;
+    case EL_BALLOON_SEND_DOWN:         return GFX_BALLOON_SEND_DOWN;
+    case EL_BALLOON_SEND_ANY:          return GFX_BALLOON_SEND_ANY;
+    case EL_EMC_STEELWALL1:            return GFX_EMC_STEEL_WALL_1;
+    case EL_EMC_STEELWALL2:            return GFX_EMC_STEEL_WALL_2;
+    case EL_EMC_STEELWALL3:            return GFX_EMC_STEEL_WALL_3;
+    case EL_EMC_STEELWALL4:            return GFX_EMC_STEEL_WALL_4;
+    case EL_EMC_WALL_PILLAR_UPPER:     return GFX_EMC_WALL_1;
+    case EL_EMC_WALL_PILLAR_MIDDLE:    return GFX_EMC_WALL_2;
+    case EL_EMC_WALL_PILLAR_LOWER:     return GFX_EMC_WALL_3;
+    case EL_EMC_WALL4:                 return GFX_EMC_WALL_4;
+    case EL_EMC_WALL5:                 return GFX_EMC_WALL_5;
+    case EL_EMC_WALL6:                 return GFX_EMC_WALL_6;
+    case EL_EMC_WALL7:                 return GFX_EMC_WALL_7;
+    case EL_EMC_WALL8:                 return GFX_EMC_WALL_8;
+    case EL_TUBE_CROSS:                        return GFX_TUBE_CROSS;
+    case EL_TUBE_VERTICAL:             return GFX_TUBE_VERTICAL;
+    case EL_TUBE_HORIZONTAL:           return GFX_TUBE_HORIZONTAL;
+    case EL_TUBE_VERT_LEFT:            return GFX_TUBE_VERT_LEFT;
+    case EL_TUBE_VERT_RIGHT:           return GFX_TUBE_VERT_RIGHT;
+    case EL_TUBE_HORIZ_UP:             return GFX_TUBE_HORIZ_UP;
+    case EL_TUBE_HORIZ_DOWN:           return GFX_TUBE_HORIZ_DOWN;
+    case EL_TUBE_LEFT_UP:              return GFX_TUBE_LEFT_UP;
+    case EL_TUBE_LEFT_DOWN:            return GFX_TUBE_LEFT_DOWN;
+    case EL_TUBE_RIGHT_UP:             return GFX_TUBE_RIGHT_UP;
+    case EL_TUBE_RIGHT_DOWN:           return GFX_TUBE_RIGHT_DOWN;
+    case EL_SPRING:                    return GFX_SPRING;
+    case EL_SPRING_MOVING:             return GFX_SPRING;
+    case EL_TRAP_INACTIVE:             return GFX_TRAP_INACTIVE;
+    case EL_TRAP_ACTIVE:               return GFX_TRAP_ACTIVE;
+    case EL_BD_WALL:                   return GFX_BD_WALL;
+    case EL_BD_ROCK:                   return GFX_BD_ROCK;
+    case EL_DX_SUPABOMB:               return GFX_DX_SUPABOMB;
+    case EL_SP_MURPHY_CLONE:           return GFX_SP_MURPHY_CLONE;
 
     default:
     {