X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=ce0aff38a2769de47d7b22becaa01980225fbb8e;hb=f8f7840ddc57a2c31a3d6ab664b0e4e7e7ad69ce;hp=e0d444b1cd2ceba546f9227c70e6faab3ae68dff;hpb=6a5685ceb73a6e3375ff32c0d6ff383eac9a2a9d;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index e0d444b1..ce0aff38 100644
--- a/src/files.c
+++ b/src/files.c
@@ -421,26 +421,37 @@ static void setLevelInfoToDefaults()
     switch (LEVELCLASS(leveldir_current))
     {
       case LEVELCLASS_TUTORIAL:
-  	strcpy(level.author, PROGRAM_AUTHOR_STRING);
-  	break;
+	strcpy(level.author, PROGRAM_AUTHOR_STRING);
+	break;
 
       case LEVELCLASS_CONTRIBUTION:
-  	strncpy(level.author, leveldir_current->name,MAX_LEVEL_AUTHOR_LEN);
-  	level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
-  	break;
+	strncpy(level.author, leveldir_current->name,MAX_LEVEL_AUTHOR_LEN);
+	level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
+	break;
 
       case LEVELCLASS_USER:
-  	strncpy(level.author, getRealName(), MAX_LEVEL_AUTHOR_LEN);
-  	level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
-  	break;
+	strncpy(level.author, getRealName(), MAX_LEVEL_AUTHOR_LEN);
+	level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
+	break;
 
       default:
-  	/* keep default value */
-  	break;
+	/* keep default value */
+	break;
     }
   }
 }
 
+static int checkLevelElement(int element)
+{
+  if (element >= EL_FIRST_RUNTIME_EL)
+  {
+    Error(ERR_WARN, "invalid level element %d", element);
+    element = EL_CHAR_FRAGE;
+  }
+
+  return element;
+}
+
 void LoadLevel(int level_nr)
 {
   int i, x, y;
@@ -510,7 +521,7 @@ void LoadLevel(int level_nr)
       for(x=0; x<3; x++)
       {
 	if (i < STD_ELEMENT_CONTENTS)
-	  level.yam_content[i][x][y] = fgetc(file);
+	  level.yam_content[i][x][y] = checkLevelElement(fgetc(file));
 	else
 	  level.yam_content[i][x][y] = EL_LEERRAUM;
       }
@@ -520,7 +531,7 @@ void LoadLevel(int level_nr)
   level.amoeba_speed	= fgetc(file);
   level.time_magic_wall	= fgetc(file);
   level.time_wheel	= fgetc(file);
-  level.amoeba_content	= fgetc(file);
+  level.amoeba_content	= checkLevelElement(fgetc(file));
   level.double_speed	= (fgetc(file) == 1 ? TRUE : FALSE);
   level.gravity		= (fgetc(file) == 1 ? TRUE : FALSE);
 
@@ -566,9 +577,10 @@ void LoadLevel(int level_nr)
 	for(y=0; y<3; y++)
 	  for(x=0; x<3; x++)
 	    level.yam_content[i][x][y] =
-	      (encoding_16bit ?
-	       getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) :
-	       fgetc(file));
+	      checkLevelElement(encoding_16bit ?
+				getFile16BitInteger(file,
+						    BYTE_ORDER_BIG_ENDIAN) :
+				fgetc(file));
 
       getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
     }
@@ -591,9 +603,9 @@ void LoadLevel(int level_nr)
   for(y=0; y<lev_fieldy; y++)
     for(x=0; x<lev_fieldx; x++)
       Feld[x][y] = Ur[x][y] =
-	(encoding_16bit ?
-	 getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) :
-	 fgetc(file));
+	checkLevelElement(encoding_16bit ?
+			  getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) :
+			  fgetc(file));
 
   fclose(file);
 
@@ -1431,6 +1443,42 @@ static void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi)
   ldi->next = NULL;
 }
 
+static void setLevelDirInfoToDefaultsFromParent(struct LevelDirInfo *ldi,
+						struct LevelDirInfo *parent)
+{
+  if (parent == NULL)
+  {
+    setLevelDirInfoToDefaults(ldi);
+    return;
+  }
+
+  /* first copy all values from the parent structure ... */
+  *ldi = *parent;
+
+  /* ... then set all fields to default that cannot be inherited from parent.
+     This is especially important for all those fields that can be set from
+     the 'levelinfo.conf' config file, because the function 'setSetupInfo()'
+     calls 'free()' for all already set token values which requires that no
+     other structure's pointer may point to them!
+  */
+
+  ldi->filename = NULL;
+  ldi->fullpath = NULL;
+  ldi->basepath = NULL;
+  ldi->name = getStringCopy(ANONYMOUS_NAME);
+  ldi->name_short = NULL;
+  ldi->name_sorting = NULL;
+  ldi->author = getStringCopy(parent->author);
+  ldi->imported_from = getStringCopy(parent->imported_from);
+
+  ldi->level_group = FALSE;
+  ldi->parent_link = FALSE;
+
+  ldi->node_parent = parent;
+  ldi->node_group = NULL;
+  ldi->next = NULL;
+}
+
 static void setSetupInfoToDefaults(struct SetupInfo *si)
 {
   int i;
@@ -1636,9 +1684,7 @@ static void LoadLevelInfoFromLevelDir(struct LevelDirInfo **node_first,
       int i;
 
       checkSetupFileListIdentifier(setup_file_list, LEVELINFO_COOKIE);
-      setLevelDirInfoToDefaults(leveldir_new);
-
-      leveldir_new->node_parent = node_parent;
+      setLevelDirInfoToDefaultsFromParent(leveldir_new, node_parent);
 
       /* set all structure fields according to the token/value pairs */
       ldi = *leveldir_new;