rnd-20030421-1-src

[rocksndiamonds.git] / src / editor.c

diff --git a/src/editor.c b/src/editor.c
index df3db706e31ba03f7fce6d18943144d25ba9631d..53eb0ea0e32bd2aa9f0c991656bf5dc11f5f8c17 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -1064,15 +1064,15 @@ static int editor_el_emerald_mine[] =
   EL_EM_KEY_3_FILE,
   EL_EM_KEY_4_FILE,
 
-  EL_EM_GATE_1,
-  EL_EM_GATE_2,
-  EL_EM_GATE_3,
-  EL_EM_GATE_4,
-
-  EL_EM_GATE_1_GRAY,
-  EL_EM_GATE_2_GRAY,
-  EL_EM_GATE_3_GRAY,
-  EL_EM_GATE_4_GRAY,
+  EL_EM_GATE_1_CLOSED,
+  EL_EM_GATE_2_CLOSED,
+  EL_EM_GATE_3_CLOSED,
+  EL_EM_GATE_4_CLOSED,
+
+  EL_EM_GATE_1_GRAY_CLOSED,
+  EL_EM_GATE_2_GRAY_CLOSED,
+  EL_EM_GATE_3_GRAY_CLOSED,
+  EL_EM_GATE_4_GRAY_CLOSED,
 };
 static int num_editor_el_emerald_mine = SIZEOF_ARRAY_INT(editor_el_emerald_mine);
 
@@ -1088,15 +1088,15 @@ static int editor_el_more[] =
   EL_KEY_3,
   EL_KEY_4,
 
-  EL_GATE_1,
-  EL_GATE_2,
-  EL_GATE_3,
-  EL_GATE_4,
+  EL_GATE_1_CLOSED,
+  EL_GATE_2_CLOSED,
+  EL_GATE_3_CLOSED,
+  EL_GATE_4_CLOSED,
 
-  EL_GATE_1_GRAY,
-  EL_GATE_2_GRAY,
-  EL_GATE_3_GRAY,
-  EL_GATE_4_GRAY,
+  EL_GATE_1_GRAY_CLOSED,
+  EL_GATE_2_GRAY_CLOSED,
+  EL_GATE_3_GRAY_CLOSED,
+  EL_GATE_4_GRAY_CLOSED,
 
   EL_ARROW_LEFT,
   EL_ARROW_RIGHT,
@@ -3440,6 +3440,7 @@ static void DrawPropertiesConfig()
       MapCheckbuttonGadget(i);
     }
 
+#if 1
     /* draw selectbox gadget */
     i = ED_SELECTBOX_ID_CUSTOM_CHANGE_CAUSE;
     x = selectbox_info[i].x + xoffset_right2;
@@ -3451,6 +3452,7 @@ static void DrawPropertiesConfig()
     ModifyGadget(level_editor_gadget[selectbox_info[i].gadget_id],
                 GDI_SELECTBOX_INDEX, *selectbox_info[i].index, GDI_END);
     MapSelectboxGadget(i);
+#endif
   }
 }
 
@@ -3681,7 +3683,6 @@ static void DrawPropertiesInfo()
   {
     { EP_AMOEBALIVE,           "- living amoeba"               },
     { EP_AMOEBOID,             "- amoeboid"                    },
-    { EP_PFORTE,               "- pforte"                      },
     { EP_SOLID,                        "- solid"                       },
     { EP_INDESTRUCTIBLE,       "- undestructible"              },
     { EP_SLIPPERY,             "- slippery"                    },
@@ -3706,8 +3707,7 @@ static void DrawPropertiesInfo()
     { EP_HAS_CONTENT,          "- has content"                 },
     { EP_DIGGABLE,             "- diggable"                    },
     { EP_SP_ELEMENT,           "- SB style"                    },
-    { EP_WALKABLE_THROUGH,     "- walkable through"            },
-    { EP_OVER_PLAYER,          "- over player"                 },
+    { EP_WALKABLE_INSIDE,      "- walkable inside"             },
     { EP_ACTIVE_BOMB,          "- active bomb"                 },
     { EP_BELT,                 "- belt"                        },
     { EP_BELT_ACTIVE,          "- active belt"                 },
@@ -3747,6 +3747,7 @@ static void DrawPropertiesInfo()
     if (HAS_PROPERTY(properties_element, properties[i].value))
       num_standard_properties++;
 
+#if 1
   if (num_standard_properties > 0)
   {
     DrawTextF(pad_x, pad_y + screen_line * font2_height, font1_nr,
@@ -3765,6 +3766,7 @@ static void DrawPropertiesInfo()
 
     screen_line++;
   }
+#endif
 
   PrintInfoText("Description:", FONT_TEXT_1, screen_line);
   if (PrintElementDescriptionFromFile(filename, screen_line + 1) == 0)
@@ -3773,7 +3775,8 @@ static void DrawPropertiesInfo()
 
 static void DrawPropertiesAdvanced()
 {
-  DrawText(SX + ED_SETTINGS_XPOS, SY + 5 * TILEY, "Coming soon!", FONT_TEXT_1);
+  DrawText(SX + ED_SETTINGS_XPOS, SY + 5 * TILEY,
+          "Under construction! :-)", FONT_TEXT_1);
 }
 
 static void DrawPropertiesWindow()