rnd-20050314-1-src

[rocksndiamonds.git] / src / editor.c

diff --git a/src/editor.c b/src/editor.c
index 75c92d391f8c4ddc7897f0256cb66abe7492daef..f6c63d1dd7d028d9e78d43501f8c7c8a669f81a4 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -1327,6 +1327,7 @@ static struct ValueTextInfo options_move_direction[] =
 
 static struct ValueTextInfo options_move_stepsize[] =
 {
+  { 0,                         "not moving"                    },
   { 1,                         "very slow"                     },
   { 2,                         "slow"                          },
   { 4,                         "normal"                        },
@@ -2718,20 +2719,20 @@ static int editor_hl_emerald_mine_club[] =
 
 static int editor_el_emerald_mine_club[] =
 {
-  EL_EM_KEY_5,
-  EL_EM_KEY_6,
-  EL_EM_KEY_7,
-  EL_EM_KEY_8,
+  EL_EMC_KEY_5,
+  EL_EMC_KEY_6,
+  EL_EMC_KEY_7,
+  EL_EMC_KEY_8,
 
-  EL_EM_GATE_5,
-  EL_EM_GATE_6,
-  EL_EM_GATE_7,
-  EL_EM_GATE_8,
+  EL_EMC_GATE_5,
+  EL_EMC_GATE_6,
+  EL_EMC_GATE_7,
+  EL_EMC_GATE_8,
 
-  EL_EM_GATE_5_GRAY,
-  EL_EM_GATE_6_GRAY,
-  EL_EM_GATE_7_GRAY,
-  EL_EM_GATE_8_GRAY,
+  EL_EMC_GATE_5_GRAY,
+  EL_EMC_GATE_6_GRAY,
+  EL_EMC_GATE_7_GRAY,
+  EL_EMC_GATE_8_GRAY,
 
   EL_EMC_STEELWALL_1,
   EL_EMC_STEELWALL_2,
@@ -2784,7 +2785,7 @@ static int editor_el_emerald_mine_club[] =
   EL_EMC_SPRING_BUMPER,
 
   EL_EMC_DRIPPER,
-  EL_EMPTY,
+  EL_EMC_FAKE_GRASS,
   EL_EMPTY,
   EL_EMPTY,
 };
@@ -4096,7 +4097,11 @@ static void ReinitializeElementList()
 
   checked_free(editor_elements);
 
+#if 0
   if (!initialized)
+#else
+  /* reload user defined element list for each invocation of level editor */
+#endif
   {
     /* initialize optional user defined element list */
     LoadUserDefinedEditorElementList(&editor_el_user_defined_ptr,
@@ -7275,10 +7280,10 @@ static struct
   { EL_EM_KEY_3_FILE,  &level.score[SC_KEY],           TEXT_COLLECTING },
   { EL_EM_KEY_4_FILE,  &level.score[SC_KEY],           TEXT_COLLECTING },
 #endif
-  { EL_EM_KEY_5,       &level.score[SC_KEY],           TEXT_COLLECTING },
-  { EL_EM_KEY_6,       &level.score[SC_KEY],           TEXT_COLLECTING },
-  { EL_EM_KEY_7,       &level.score[SC_KEY],           TEXT_COLLECTING },
-  { EL_EM_KEY_8,       &level.score[SC_KEY],           TEXT_COLLECTING },
+  { EL_EMC_KEY_5,      &level.score[SC_KEY],           TEXT_COLLECTING },
+  { EL_EMC_KEY_6,      &level.score[SC_KEY],           TEXT_COLLECTING },
+  { EL_EMC_KEY_7,      &level.score[SC_KEY],           TEXT_COLLECTING },
+  { EL_EMC_KEY_8,      &level.score[SC_KEY],           TEXT_COLLECTING },
   { EL_AMOEBA_WET,     &level.amoeba_speed,            TEXT_AMOEBA_SPEED },
   { EL_AMOEBA_DRY,     &level.amoeba_speed,            TEXT_AMOEBA_SPEED },
   { EL_AMOEBA_FULL,    &level.amoeba_speed,            TEXT_AMOEBA_SPEED },