rnd-20020921-3-src

[rocksndiamonds.git] / src / editor.c

diff --git a/src/editor.c b/src/editor.c
index 922dfe0699deaf9c27600642299f01c2b3531cc1..6dc35c7c3270b3ecc6102684314bed2c30d92c1c 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -760,23 +760,23 @@ int editor_element[] =
   EL_STEELWALL,
 
   EL_BD_WALL,
-  EL_MAGIC_WALL_BD_OFF,
+  EL_BD_MAGIC_WALL,
   EL_EXIT_CLOSED,
   EL_EXIT_OPEN,
 
   EL_BD_DIAMOND,
-  EL_BUTTERFLY_UP,
-  EL_FIREFLY_UP,
+  EL_BD_BUTTERFLY_UP,
+  EL_BD_FIREFLY_UP,
   EL_BD_ROCK,
 
-  EL_BUTTERFLY_LEFT,
-  EL_FIREFLY_LEFT,
-  EL_BUTTERFLY_RIGHT,
-  EL_FIREFLY_RIGHT,
+  EL_BD_BUTTERFLY_LEFT,
+  EL_BD_FIREFLY_LEFT,
+  EL_BD_BUTTERFLY_RIGHT,
+  EL_BD_FIREFLY_RIGHT,
 
   EL_BD_AMOEBA,
-  EL_BUTTERFLY_DOWN,
-  EL_FIREFLY_DOWN,
+  EL_BD_BUTTERFLY_DOWN,
+  EL_BD_FIREFLY_DOWN,
   EL_EMPTY,
 
   EL_CHAR('E'),
@@ -889,10 +889,10 @@ int editor_element[] =
   EL_GATE3_GRAY,
   EL_GATE4_GRAY,
 
-  EL_ARROW_LEFT,
-  EL_ARROW_RIGHT,
-  EL_ARROW_UP,
-  EL_ARROW_DOWN,
+  EL_ARROW_BLUE_LEFT,
+  EL_ARROW_BLUE_RIGHT,
+  EL_ARROW_BLUE_UP,
+  EL_ARROW_BLUE_DOWN,
 
   EL_AMOEBA_FULL,
   EL_EMERALD_YELLOW,
@@ -942,7 +942,7 @@ int editor_element[] =
   EL_EMPTY,
   EL_MOLE_DOWN,
   EL_BALLOON,
-  EL_BALLOON_SEND_ANY,
+  EL_BALLOON_SEND_ANY_DIRECTION,
 
   EL_BALLOON_SEND_LEFT,
   EL_BALLOON_SEND_RIGHT,
@@ -980,9 +980,9 @@ int editor_element[] =
   EL_CHAR('A'),
   EL_CHAR('N'),
 
-  EL_SOKOBAN_OBJEKT,
-  EL_SOKOBAN_FELD_LEER,
-  EL_SOKOBAN_FELD_VOLL,
+  EL_SOKOBAN_OBJECT,
+  EL_SOKOBAN_FIELD_EMPTY,
+  EL_SOKOBAN_FIELD_FULL,
   EL_STEELWALL,
 
   EL_CHAR('S'),
@@ -1026,7 +1026,7 @@ int editor_element[] =
   EL_SP_PORT_XY,
 
   EL_SP_ELECTRON,
-  EL_SP_BUG,
+  EL_SP_BUGGY_BASE,
   EL_SP_CHIP_LEFT,
   EL_SP_CHIP_RIGHT,
 
@@ -1107,11 +1107,11 @@ int editor_element[] =
 
   EL_TIMEGATE_CLOSED,
   EL_TIMEGATE_OPEN,
-  EL_TIMEGATE_SWITCH_OFF,
+  EL_TIMEGATE_SWITCH,
   EL_EMPTY,
 
   EL_LANDMINE,
-  EL_SAND_INVISIBLE,
+  EL_INVISIBLE_SAND,
   EL_STEELWALL_SLANTED,
   EL_EMPTY,
 
@@ -1121,7 +1121,7 @@ int editor_element[] =
   EL_LIGHT_SWITCH_ACTIVE,
 
   EL_SHIELD_NORMAL,
-  EL_SHIELD_ACTIVE,
+  EL_SHIELD_DEADLY,
   EL_EXTRA_TIME,
   EL_EMPTY,
 
@@ -1147,20 +1147,20 @@ int editor_element[] =
 
   EL_SPRING,
   EL_TUBE_RIGHT_DOWN,
-  EL_TUBE_HORIZ_DOWN,
+  EL_TUBE_HORIZONTAL_DOWN,
   EL_TUBE_LEFT_DOWN,
 
   EL_TUBE_HORIZONTAL,
-  EL_TUBE_VERT_RIGHT,
-  EL_TUBE_CROSS,
-  EL_TUBE_VERT_LEFT,
+  EL_TUBE_VERTICAL_RIGHT,
+  EL_TUBE_ALL,
+  EL_TUBE_VERTICAL_LEFT,
 
   EL_TUBE_VERTICAL,
   EL_TUBE_RIGHT_UP,
-  EL_TUBE_HORIZ_UP,
+  EL_TUBE_HORIZONTAL_UP,
   EL_TUBE_LEFT_UP,
 
-  EL_TRAP_INACTIVE,
+  EL_TRAP,
   EL_DX_SUPABOMB,
   EL_EMPTY,
   EL_EMPTY,
@@ -2620,18 +2620,18 @@ static void DrawPropertiesWindow()
     { EL_BUG_UP,       &level.score[SC_KAEFER],        TEXT_SMASHING },
     { EL_BUG_LEFT,     &level.score[SC_KAEFER],        TEXT_SMASHING },
     { EL_BUG_DOWN,     &level.score[SC_KAEFER],        TEXT_SMASHING },
-    { EL_BUTTERFLY_RIGHT,&level.score[SC_KAEFER],      TEXT_SMASHING },
-    { EL_BUTTERFLY_UP, &level.score[SC_KAEFER],        TEXT_SMASHING },
-    { EL_BUTTERFLY_LEFT,&level.score[SC_KAEFER],       TEXT_SMASHING },
-    { EL_BUTTERFLY_DOWN,&level.score[SC_KAEFER],       TEXT_SMASHING },
+    { EL_BD_BUTTERFLY_RIGHT,&level.score[SC_KAEFER],   TEXT_SMASHING },
+    { EL_BD_BUTTERFLY_UP,   &level.score[SC_KAEFER],   TEXT_SMASHING },
+    { EL_BD_BUTTERFLY_LEFT, &level.score[SC_KAEFER],   TEXT_SMASHING },
+    { EL_BD_BUTTERFLY_DOWN, &level.score[SC_KAEFER],   TEXT_SMASHING },
     { EL_SPACESHIP_RIGHT,&level.score[SC_FLIEGER],     TEXT_SMASHING },
-    { EL_SPACESHIP_UP, &level.score[SC_FLIEGER],       TEXT_SMASHING },
-    { EL_SPACESHIP_LEFT,&level.score[SC_FLIEGER],      TEXT_SMASHING },
-    { EL_SPACESHIP_DOWN,&level.score[SC_FLIEGER],      TEXT_SMASHING },
-    { EL_FIREFLY_RIGHT,        &level.score[SC_FLIEGER],       TEXT_SMASHING },
-    { EL_FIREFLY_UP,   &level.score[SC_FLIEGER],       TEXT_SMASHING },
-    { EL_FIREFLY_LEFT, &level.score[SC_FLIEGER],       TEXT_SMASHING },
-    { EL_FIREFLY_DOWN, &level.score[SC_FLIEGER],       TEXT_SMASHING },
+    { EL_SPACESHIP_UP,  &level.score[SC_FLIEGER],      TEXT_SMASHING },
+    { EL_SPACESHIP_LEFT, &level.score[SC_FLIEGER],     TEXT_SMASHING },
+    { EL_SPACESHIP_DOWN, &level.score[SC_FLIEGER],     TEXT_SMASHING },
+    { EL_BD_FIREFLY_RIGHT,&level.score[SC_FLIEGER],    TEXT_SMASHING },
+    { EL_BD_FIREFLY_UP,          &level.score[SC_FLIEGER],     TEXT_SMASHING },
+    { EL_BD_FIREFLY_LEFT, &level.score[SC_FLIEGER],    TEXT_SMASHING },
+    { EL_BD_FIREFLY_DOWN, &level.score[SC_FLIEGER],    TEXT_SMASHING },
     { EL_YAMYAM,       &level.score[SC_MAMPFER],       TEXT_SMASHING },
     { EL_DARK_YAMYAM,  &level.score[SC_MAMPFER],       TEXT_SMASHING },
     { EL_ROBOT,                &level.score[SC_ROBOT],         TEXT_SMASHING },