rnd-20031213-1-src

[rocksndiamonds.git] / src / editor.c

diff --git a/src/editor.c b/src/editor.c
index 11259a9c91bce9de21ab547924e3c26e0a188ea8..f6df5544d2b3a6cd3fbaf72fd53ad52ad1cb2d96 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -1071,8 +1071,10 @@ static struct ValueTextInfo options_move_pattern[] =
   { MV_TURNING_LEFT,           "turning left"                  },
   { MV_TURNING_RIGHT,          "turning right"                 },
   { MV_WHEN_PUSHED,            "when pushed"                   },
+#if 0
   { MV_MAZE_RUNNER,            "maze runner style"             },
   { MV_MAZE_HUNTER,            "maze hunter style"             },
+#endif
   { -1,                                NULL                            }
 };
 
@@ -1148,8 +1150,12 @@ static struct ValueTextInfo options_change_direct_action[] =
   { CE_LEFT_BY_PLAYER,         "left by player ..."            },
   { CE_DROPPED_BY_PLAYER,      "dropped by player"             },
   { CE_SWITCHED,               "switched ..."                  },
+#if 0
   { CE_COLLISION_ACTIVE,       "hitting something ..."         },
   { CE_COLLISION_PASSIVE,      "hit by something ..."          },
+#else
+  { CE_COLLISION_ACTIVE,       "collision ..."                 },
+#endif
   { CE_IMPACT,                 "impact (on something)"         },
   { CE_SMASHED,                        "smashed (from above)"          },
   { -1,                                NULL                            }
@@ -1166,8 +1172,10 @@ static struct ValueTextInfo options_change_other_action[] =
   { CE_OTHER_GETS_COLLECTED,   "player collects"               },
   { CE_OTHER_GETS_DROPPED,     "player drops"                  },
   { CE_OTHER_IS_TOUCHING,      "touching ..."                  },
+#if 0
   { CE_OTHER_IS_COLL_ACTIVE,   "hitting ..."                   },
   { CE_OTHER_IS_COLL_PASSIVE,  "hit by ..."                    },
+#endif
   { CE_OTHER_IS_SWITCHING,     "switch of ..."                 },
   { CE_OTHER_IS_CHANGING,      "change of"                     },
   { CE_OTHER_IS_EXPLODING,     "explosion of"                  },
@@ -2138,7 +2146,11 @@ static int editor_el_more[] =
   EL_BD_FIREFLY,
 
   EL_MOLE_LEFT,
+#if 0
   EL_MAZE_RUNNER,
+#else
+  EL_EMPTY,
+#endif
   EL_MOLE_RIGHT,
   EL_PACMAN,
 
@@ -5007,7 +5019,7 @@ static void CopyCustomElementPropertiesToGame(int element)
 
   if (level.use_custom_template)
   {
-    if (Request("Copy and modify level tem- plate ?", REQ_ASK))
+    if (Request("Copy and modify level template ?", REQ_ASK))
     {
       level.use_custom_template = FALSE;
       ModifyGadget(level_editor_gadget[GADGET_ID_CUSTOM_USE_TEMPLATE],
@@ -7188,11 +7200,11 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
     boolean new_template = (!LevelFileExists(-1));
 
     if (new_template ||
-       Request("Save this tem- plate and kill the old ?", REQ_ASK))
+       Request("Save this template and kill the old ?", REQ_ASK))
       SaveLevelTemplate();
 
     if (new_template)
-      Request("Tem- plate saved !", REQ_CONFIRM);
+      Request("Template saved !", REQ_CONFIRM);
   }
   else if (type_id == ED_TEXTBUTTON_ID_ADD_CHANGE_PAGE &&
           custom_element.num_change_pages < MAX_CHANGE_PAGES)
@@ -7275,7 +7287,7 @@ static void HandleCheckbuttons(struct GadgetInfo *gi)
   {
     if (level.use_custom_template && !LevelFileExists(-1))
     {
-      Request("No level tem- plate found !", REQ_CONFIRM);
+      Request("No level template found !", REQ_CONFIRM);
 
       level.use_custom_template = FALSE;
       ModifyGadget(gi, GDI_CHECKED, FALSE, GDI_END);