X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffiles.c;h=85d171287bebb4703b146aa53aa283d27ad2ae37;hb=refs%2Ftags%2F4.0.1.4;hp=7255cdc54533df9248bd1e7b16284375ff31eccf;hpb=5f97934090500638ac595e78232ecec2ea5d403c;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 7255cdc5..85d17128 100644
--- a/src/files.c
+++ b/src/files.c
@@ -3664,7 +3664,8 @@ void CopyNativeLevel_SP_to_RND(struct LevelInfo *level)
 {
   struct LevelInfo_SP *level_sp = level->native_sp_level;
   LevelInfoType *header = &level_sp->header;
-  int i, x, y;
+  boolean num_invalid_elements = 0;
+  int i, j, x, y;
 
   level->fieldx = level_sp->width;
   level->fieldy = level_sp->height;
@@ -3677,20 +3678,39 @@ void CopyNativeLevel_SP_to_RND(struct LevelInfo *level)
       int element_new = getMappedElement(map_element_SP_to_RND(element_old));
 
       if (element_new == EL_UNKNOWN)
-	Error(ERR_WARN, "invalid element %d at position %d, %d",
+      {
+	num_invalid_elements++;
+
+	Error(ERR_DEBUG, "invalid element %d at position %d, %d",
 	      element_old, x, y);
+      }
 
       level->field[x][y] = element_new;
     }
   }
 
+  if (num_invalid_elements > 0)
+    Error(ERR_WARN, "found %d invalid elements%s", num_invalid_elements,
+	  (!options.debug ? " (use '--debug' for more details)" : ""));
+
   for (i = 0; i < MAX_PLAYERS; i++)
     level->initial_player_gravity[i] =
       (header->InitialGravity == 1 ? TRUE : FALSE);
 
+  /* skip leading spaces */
   for (i = 0; i < SP_LEVEL_NAME_LEN; i++)
-    level->name[i] = header->LevelTitle[i];
-  level->name[SP_LEVEL_NAME_LEN] = '\0';
+    if (header->LevelTitle[i] != ' ')
+      break;
+
+  /* copy level title */
+  for (j = 0; i < SP_LEVEL_NAME_LEN; i++, j++)
+    level->name[j] = header->LevelTitle[i];
+  level->name[j] = '\0';
+
+  /* cut trailing spaces */
+  for (; j > 0; j--)
+    if (level->name[j - 1] == ' ' && level->name[j] == '\0')
+      level->name[j - 1] = '\0';
 
   level->gems_needed = header->InfotronsNeeded;
 
@@ -3830,7 +3850,7 @@ static void CopyNativeTape_SP_to_RND(struct LevelInfo *level)
     int tape_action = map_key_SP_to_RND(demo_action);
     int tape_repeat = demo_repeat + 1;
     byte action[MAX_PLAYERS] = { tape_action, 0, 0, 0 };
-    boolean success;
+    boolean success = 0;
     int j;
 
     for (j = 0; j < tape_repeat; j++)