X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=2ef526ddc5a4c943ebe62e668f83c08ce43c3ec6;hb=f6482a3218cec02ca8e251993972e681e47d4244;hp=fb9f9603c192c90b29adbe91fb141106250acea8;hpb=63ee0a61e7a4b4ec02c93d9647488f70784a6516;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index fb9f9603..2ef526dd 100644
--- a/src/files.c
+++ b/src/files.c
@@ -26,7 +26,7 @@
 #define MAX_LINE_LEN		1000	/* maximal input line length */
 #define CHUNK_ID_LEN		4	/* IFF style chunk id length */
 #define LEVEL_HEADER_SIZE	80	/* size of level file header */
-#define LEVEL_HEADER_UNUSED	18	/* unused level header bytes */
+#define LEVEL_HEADER_UNUSED	16	/* unused level header bytes */
 #define TAPE_HEADER_SIZE	20	/* size of tape file header */
 #define TAPE_HEADER_UNUSED	7	/* unused tape header bytes */
 #define FILE_VERSION_1_0	10	/* old 1.0 file version */
@@ -108,6 +108,11 @@
 			 IS_LEVELCLASS_USER(n) ? LEVELCLASS_USER : \
 			 LEVELCLASS_UNDEFINED)
 
+#define LEVELCOLOR(n)	(IS_LEVELCLASS_TUTORIAL(n) ? FC_BLUE : \
+			 IS_LEVELCLASS_CLASSICS(n) ? FC_YELLOW : \
+			 IS_LEVELCLASS_CONTRIBUTION(n) ? FC_GREEN : \
+			 IS_LEVELCLASS_USER(n) ? FC_RED : FC_BLUE)
+
 static void SaveUserLevelInfo();		/* for 'InitUserLevelDir()' */
 static char *getSetupLine(char *, int);		/* for 'SaveUserLevelInfo()' */
 
@@ -308,8 +313,8 @@ static void setLevelInfoToDefaults()
   level.dauer_sieb = 10;
   level.dauer_ablenk = 10;
   level.amoebe_inhalt = EL_DIAMANT;
-
-  level.high_speed = FALSE;
+  level.double_speed = FALSE;
+  level.gravity = FALSE;
 
   for(i=0; i<MAX_LEVEL_NAME_LEN; i++)
     level.name[i] = '\0';
@@ -441,7 +446,9 @@ void LoadLevel(int level_nr)
   level.tempo_amoebe	= fgetc(file);
   level.dauer_sieb	= fgetc(file);
   level.dauer_ablenk	= fgetc(file);
-  level.amoebe_inhalt = fgetc(file);
+  level.amoebe_inhalt	= fgetc(file);
+  level.double_speed	= (fgetc(file) == 1 ? TRUE : FALSE);
+  level.gravity		= (fgetc(file) == 1 ? TRUE : FALSE);
 
   for(i=0; i<LEVEL_HEADER_UNUSED; i++)	/* skip unused header bytes */
     fgetc(file);
@@ -504,7 +511,7 @@ void LoadLevel(int level_nr)
   {
     Error(ERR_WARN, "level file '%s' has version number 1.0", filename);
     Error(ERR_WARN, "using high speed movement for player");
-    level.high_speed = TRUE;
+    level.double_speed = TRUE;
   }
 }
 
@@ -544,6 +551,8 @@ void SaveLevel(int level_nr)
   fputc(level.dauer_sieb, file);
   fputc(level.dauer_ablenk, file);
   fputc(level.amoebe_inhalt, file);
+  fputc((level.double_speed ? 1 : 0), file);
+  fputc((level.gravity ? 1 : 0), file);
 
   for(i=0; i<LEVEL_HEADER_UNUSED; i++)	/* set unused header bytes to zero */
     fputc(0, file);
@@ -1197,7 +1206,7 @@ static struct SetupFileList *loadSetupFileList(char *filename)
     /* cut trailing comment or whitespace from input line */
     for (line_ptr = line; *line_ptr; line_ptr++)
     {
-      if (*line_ptr == '#' || *line_ptr == '\n')
+      if (*line_ptr == '#' || *line_ptr == '\n' || *line_ptr == '\r')
       {
 	*line_ptr = '\0';
 	break;
@@ -1515,6 +1524,7 @@ static int LoadLevelInfoFromLevelDir(char *level_directory, int start_entry)
 	leveldir[current_entry].levels - 1;
       leveldir[current_entry].user_defined =
 	(level_directory == options.level_directory ? FALSE : TRUE);
+      leveldir[current_entry].color = LEVELCOLOR(current_entry);
 
       freeSetupFileList(setup_file_list);
       current_entry++;