From: Holger Schemel <info@artsoft.org>
Date: Fri, 4 Jul 2003 08:50:56 +0000 (+0200)
Subject: rnd-20030704-1-src
X-Git-Tag: 3.0.0^2~26
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=516fafe7ee088155d156e0f36f165a0d557d2bde;p=rocksndiamonds.git

rnd-20030704-1-src
---

diff --git a/src/conftime.h b/src/conftime.h
index ec4b799c..9eaef5e6 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2003-07-03 21:19]"
+#define COMPILE_DATE_STRING "[2003-07-04 09:17]"
diff --git a/src/editor.c b/src/editor.c
index 4696db8b..969aad79 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -2384,10 +2384,10 @@ static char *getElementInfoText(int element)
 
   if (element < NUM_FILE_ELEMENTS)
   {
-    if (element_info[element].custom_description != NULL)
-      info_text = element_info[element].custom_description;
-    else if (strlen(element_info[element].description) > 0)
+    if (strlen(element_info[element].description) > 0)
       info_text = element_info[element].description;
+    else if (element_info[element].custom_description != NULL)
+      info_text = element_info[element].custom_description;
     else if (element_info[element].editor_description != NULL)
       info_text = element_info[element].editor_description;
   }
@@ -5926,7 +5926,11 @@ static void HandleTextInputGadgets(struct GadgetInfo *gi)
   strcpy(textinput_info[type_id].value, gi->text.value);
 
   if (type_id == ED_TEXTINPUT_ID_ELEMENT_NAME)
+  {
     CopyCustomElementPropertiesToGame(properties_element);
+
+    ModifyEditorElementList();	/* update changed button info text */
+  }
 }
 
 static void HandleSelectboxGadgets(struct GadgetInfo *gi)
diff --git a/src/files.c b/src/files.c
index 787013ba..1396b60e 100644
--- a/src/files.c
+++ b/src/files.c
@@ -105,10 +105,14 @@ static void setLevelInfoToDefaults()
   {
     int element = EL_CUSTOM_START + i;
 
-    for(j=0; j<MAX_ELEMENT_NAME_LEN; j++)
+    for(j=0; j<MAX_ELEMENT_NAME_LEN + 1; j++)
       element_info[element].description[j] = '\0';
-    strcpy(element_info[element].description,
-	   element_info[element].editor_description);
+    if (element_info[element].custom_description != NULL)
+      strncpy(element_info[element].description,
+	      element_info[element].custom_description, MAX_ELEMENT_NAME_LEN);
+    else
+      strcpy(element_info[element].description,
+	     element_info[element].editor_description);
 
     element_info[element].use_gfx_element = FALSE;
     element_info[element].gfx_element = EL_EMPTY_SPACE;