X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Feditor.c;h=91e10699148bb92ef47d048fe84fa2f129c7347a;hp=a0f9ca0b6975df63e936ed7dbc01481e7b3f2b3b;hb=8d46c5298f0fcce7bdb52f3835b2fbbdc403dfe0;hpb=8555e08bda91e309c9878785a5aef82ca3497394

diff --git a/src/editor.c b/src/editor.c
index a0f9ca0b..91e10699 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -751,15 +751,15 @@ int editor_element[] =
   EL_ERDREICH,
   EL_BETON,
 
-  EL_FELSBODEN,
-  EL_SIEB2_INAKTIV,
+  EL_BD_WALL,
+  EL_MAGIC_WALL_BD_OFF,
   EL_AUSGANG_ZU,
   EL_AUSGANG_AUF,
 
   EL_EDELSTEIN_BD,
   EL_BUTTERFLY_UP,
   EL_FIREFLY_UP,
-  EL_FELSBROCKEN,
+  EL_BD_ROCK,
 
   EL_BUTTERFLY_LEFT,
   EL_FIREFLY_LEFT,
@@ -799,7 +799,7 @@ int editor_element[] =
   EL_BETON,
   EL_MAUERWERK,
   EL_FELSBODEN,
-  EL_SIEB_INAKTIV,
+  EL_MAGIC_WALL_OFF,
 
   EL_EDELSTEIN,
   EL_DIAMANT,
@@ -951,6 +951,17 @@ int editor_element[] =
   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_WALL_4,
+  EL_EMC_WALL_5,
+  EL_EMC_WALL_6,
+  EL_EMC_WALL_7,
+
+
   EL_CHAR('S'),
   EL_CHAR('O'),
   EL_CHAR('K'),
@@ -1046,6 +1057,11 @@ int editor_element[] =
   EL_CHAR('I'),
   EL_CHAR('I'),
 
+  EL_PEARL,
+  EL_CRYSTAL,
+  EL_WALL_PEARL,
+  EL_WALL_CRYSTAL,
+
   EL_BELT1_LEFT,
   EL_BELT1_MIDDLE,
   EL_BELT1_RIGHT,
@@ -1101,6 +1117,46 @@ int editor_element[] =
   EL_EXTRA_TIME,
   EL_LEERRAUM,
 
+  EL_CHAR('D'),
+  EL_CHAR('X'),
+  EL_CHAR('-'),
+  EL_CHAR(' '),
+
+  EL_CHAR('B'),
+  EL_CHAR('O'),
+  EL_CHAR('U'),
+  EL_CHAR('L'),
+
+  EL_CHAR('-'),
+  EL_CHAR('D'),
+  EL_CHAR('E'),
+  EL_CHAR('R'),
+
+  EL_CHAR('D'),
+  EL_CHAR('A'),
+  EL_CHAR('S'),
+  EL_CHAR('H'),
+
+  EL_SPRING,
+  EL_TUBE_RIGHT_DOWN,
+  EL_TUBE_HORIZ_DOWN,
+  EL_TUBE_LEFT_DOWN,
+
+  EL_TUBE_HORIZONTAL,
+  EL_TUBE_VERT_RIGHT,
+  EL_TUBE_CROSS,
+  EL_TUBE_VERT_LEFT,
+
+  EL_TUBE_VERTICAL,
+  EL_TUBE_RIGHT_UP,
+  EL_TUBE_HORIZ_UP,
+  EL_TUBE_LEFT_UP,
+
+  EL_TRAP_INACTIVE,
+  EL_DX_SUPABOMB,
+  EL_LEERRAUM,
+  EL_LEERRAUM,
+
   /*
   EL_CHAR('D'),
   EL_CHAR('Y'),
@@ -1900,8 +1956,8 @@ static void MapControlButtons()
   /* map buttons to select level */
   counter_id = ED_COUNTER_ID_SELECT_LEVEL;
   ModifyEditorCounterLimits(counter_id,
-			    leveldir[leveldir_nr].first_level,
-			    leveldir[leveldir_nr].last_level);
+			    leveldir_current->first_level,
+			    leveldir_current->last_level);
   ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value);
   MapCounterButtons(counter_id);
 }
@@ -2570,7 +2626,7 @@ static void DrawPropertiesWindow()
     { EL_AMOEBE_NORM,	&level.amoeba_speed,		TEXT_SPEED },
     { EL_AMOEBE_VOLL,	&level.amoeba_speed,		TEXT_SPEED },
     { EL_AMOEBE_BD,	&level.amoeba_speed,		TEXT_SPEED },
-    { EL_SIEB_INAKTIV,	&level.time_magic_wall,		TEXT_DURATION },
+    { EL_MAGIC_WALL_OFF,&level.time_magic_wall,		TEXT_DURATION },
     { EL_ABLENK_AUS,	&level.time_wheel,		TEXT_DURATION },
     { -1, NULL, NULL }
   };
@@ -3821,7 +3877,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       break;
 
     case GADGET_ID_SAVE:
-      if (leveldir[leveldir_nr].readonly)
+      if (leveldir_current->readonly)
       {
 	Request("This level is read only !", REQ_CONFIRM);
 	break;