rnd-20020609-1-src

[rocksndiamonds.git] / src / editor.c

diff --git a/src/editor.c b/src/editor.c
index 920f0861ccf408ed2d16f36831b4b937c861f700..ac9a5d847b736ba871dbbdd565a38690243aa117 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -1273,8 +1273,8 @@ static char *getElementInfoText(int element)
 {
   char *info_text = "unknown";
 
-  if (element < num_element_info)
-    info_text = element_info[element];
+  if (element < NUM_LEVEL_ELEMENTS)
+    info_text = element_info[element].editor_description;
   else
     Error(ERR_WARN, "no element description for element %d", element);
 
@@ -3920,6 +3920,9 @@ static void HandleControlButtons(struct GadgetInfo *gi)
        Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
       else
       {
+       if (LevelChanged())
+         level.game_version = GAME_VERSION_ACTUAL;
+
        for(x=0; x<lev_fieldx; x++)
          for(y=0; y<lev_fieldy; y++)
            FieldBackup[x][y] = Ur[x][y];
@@ -4048,7 +4051,7 @@ void HandleLevelEditorKeyInput(Key key)
       ClickOnGadget(level_editor_gadget[id], button);
     else if (letter == '.')
       ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
-    else if (key == KSYM_space || key == KSYM_Return)
+    else if (key == KSYM_Return || key == setup.shortcut.toggle_pause)
       ClickOnGadget(level_editor_gadget[GADGET_ID_TEST], button);
     else
       for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)