X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=fad45178abaf3bf6c61eb9567df2b2e97bdd5dc9;hb=fa2a77aa4b53bb786e67f35d6c46f759ebe7823d;hp=51710b07c105d526806aa4b1276321d06dfed751;hpb=79411a5006963926966da0465fd46344a34a57fe;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 51710b07..fad45178 100644
--- a/src/files.c
+++ b/src/files.c
@@ -58,7 +58,7 @@ static void setLevelInfoToDefaults()
 
   for(x=0; x<MAX_LEV_FIELDX; x++)
     for(y=0; y<MAX_LEV_FIELDY; y++)
-      Feld[x][y] = Ur[x][y] = EL_ERDREICH;
+      Feld[x][y] = Ur[x][y] = EL_SAND;
 
   level.time = 100;
   level.gems_needed = 0;
@@ -67,7 +67,7 @@ static void setLevelInfoToDefaults()
   level.time_wheel = 10;
   level.time_light = 10;
   level.time_timegate = 10;
-  level.amoeba_content = EL_DIAMANT;
+  level.amoeba_content = EL_DIAMOND;
   level.double_speed = FALSE;
   level.gravity = FALSE;
   level.em_slippery_gems = FALSE;
@@ -88,13 +88,13 @@ static void setLevelInfoToDefaults()
     for(x=0; x<3; x++)
       for(y=0; y<3; y++)
 	level.yam_content[i][x][y] =
-	  (i < STD_ELEMENT_CONTENTS ? EL_FELSBROCKEN : EL_LEERRAUM);
+	  (i < STD_ELEMENT_CONTENTS ? EL_ROCK : EL_EMPTY);
 
-  Feld[0][0] = Ur[0][0] = EL_SPIELFIGUR;
+  Feld[0][0] = Ur[0][0] = EL_PLAYER1;
   Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] =
-    Ur[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = EL_AUSGANG_ZU;
+    Ur[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = EL_EXIT_CLOSED;
 
-  BorderElement = EL_BETON;
+  BorderElement = EL_STEELWALL;
 
   /* try to determine better author name than 'anonymous' */
   if (strcmp(leveldir_current->author, ANONYMOUS_NAME) != 0)
@@ -125,15 +125,21 @@ static void setLevelInfoToDefaults()
 	break;
     }
   }
+
+  level.no_level_file = FALSE;
 }
 
 static int checkLevelElement(int element)
 {
-  if (element >= EL_FIRST_RUNTIME)
+  if (element >= NUM_FILE_ELEMENTS)
   {
     Error(ERR_WARN, "invalid level element %d", element);
-    element = EL_CHAR_FRAGE;
+    element = EL_CHAR_QUESTION;
   }
+  else if (element == EL_PLAYER_OBSOLETE)
+    element = EL_PLAYER1;
+  else if (element == EL_KEY_OBSOLETE)
+    element = EL_KEY1;
 
   return element;
 }
@@ -283,7 +289,7 @@ static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level)
   if (num_contents < 1 || num_contents > MAX_ELEMENT_CONTENTS)
     num_contents = STD_ELEMENT_CONTENTS;
 
-  if (element == EL_MAMPFER)
+  if (element == EL_YAMYAM)
   {
     level->num_yam_contents = num_contents;
 
@@ -292,7 +298,7 @@ static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level)
 	for(x=0; x<3; x++)
 	  level->yam_content[i][x][y] = content_array[i][x][y];
   }
-  else if (element == EL_AMOEBE_BD)
+  else if (element == EL_BD_AMOEBA)
   {
     level->amoeba_content = content_array[0][0][0];
   }
@@ -317,6 +323,8 @@ void LoadLevel(int level_nr)
 
   if (!(file = fopen(filename, MODE_READ)))
   {
+    level.no_level_file = TRUE;
+
     Error(ERR_WARN, "cannot read level '%s' - creating new level", filename);
     return;
   }
@@ -501,13 +509,13 @@ static void SaveLevel_HEAD(FILE *file, struct LevelInfo *level)
   for(i=0; i<STD_ELEMENT_CONTENTS; i++)
     for(y=0; y<3; y++)
       for(x=0; x<3; x++)
-	fputc((level->encoding_16bit_yamyam ? EL_LEERRAUM :
+	fputc((level->encoding_16bit_yamyam ? EL_EMPTY :
 	       level->yam_content[i][x][y]),
 	      file);
   fputc(level->amoeba_speed, file);
   fputc(level->time_magic_wall, file);
   fputc(level->time_wheel, file);
-  fputc((level->encoding_16bit_amoeba ? EL_LEERRAUM : level->amoeba_content),
+  fputc((level->encoding_16bit_amoeba ? EL_EMPTY : level->amoeba_content),
 	file);
   fputc((level->double_speed ? 1 : 0), file);
   fputc((level->gravity ? 1 : 0), file);
@@ -530,7 +538,7 @@ static void SaveLevel_CONT(FILE *file, struct LevelInfo *level)
 {
   int i, x, y;
 
-  fputc(EL_MAMPFER, file);
+  fputc(EL_YAMYAM, file);
   fputc(level->num_yam_contents, file);
   fputc(0, file);
   fputc(0, file);
@@ -563,7 +571,7 @@ static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
   int num_contents, content_xsize, content_ysize;
   int content_array[MAX_ELEMENT_CONTENTS][3][3];
 
-  if (element == EL_MAMPFER)
+  if (element == EL_YAMYAM)
   {
     num_contents = level->num_yam_contents;
     content_xsize = 3;
@@ -574,7 +582,7 @@ static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
 	for(x=0; x<3; x++)
 	  content_array[i][x][y] = level->yam_content[i][x][y];
   }
-  else if (element == EL_AMOEBE_BD)
+  else if (element == EL_BD_AMOEBA)
   {
     num_contents = 1;
     content_xsize = 1;
@@ -583,7 +591,7 @@ static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
     for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
       for(y=0; y<3; y++)
 	for(x=0; x<3; x++)
-	  content_array[i][x][y] = EL_LEERRAUM;
+	  content_array[i][x][y] = EL_EMPTY;
     content_array[0][0][0] = level->amoeba_content;
   }
   else
@@ -666,13 +674,13 @@ void SaveLevel(int level_nr)
       level.num_yam_contents != STD_ELEMENT_CONTENTS)
   {
     putFileChunkBE(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE);
-    SaveLevel_CNT2(file, &level, EL_MAMPFER);
+    SaveLevel_CNT2(file, &level, EL_YAMYAM);
   }
 
   if (level.encoding_16bit_amoeba)
   {
     putFileChunkBE(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE);
-    SaveLevel_CNT2(file, &level, EL_AMOEBE_BD);
+    SaveLevel_CNT2(file, &level, EL_BD_AMOEBA);
   }
 
   fclose(file);
@@ -838,9 +846,8 @@ static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape)
   return chunk_size;
 }
 
-void LoadTape(int level_nr)
+void LoadTapeFromFilename(char *filename)
 {
-  char *filename = getTapeFilename(level_nr);
   char cookie[MAX_LINE_LEN];
   char chunk_name[CHUNK_ID_LEN + 1];
   FILE *file;
@@ -956,6 +963,13 @@ void LoadTape(int level_nr)
   tape.length_seconds = GetTapeLength();
 }
 
+void LoadTape(int level_nr)
+{
+  char *filename = getTapeFilename(level_nr);
+
+  LoadTapeFromFilename(filename);
+}
+
 static void SaveTape_VERS(FILE *file, struct TapeInfo *tape)
 {
   putFileVersion(file, tape->file_version);
@@ -1065,17 +1079,18 @@ void DumpTape(struct TapeInfo *tape)
     return;
   }
 
-  printf("\n");
-  printf("-------------------------------------------------------------------------------\n");
+  printf_line('-', 79);
   printf("Tape of Level %d (file version %06d, game version %06d)\n",
 	 tape->level_nr, tape->file_version, tape->game_version);
-  printf("-------------------------------------------------------------------------------\n");
+  printf_line('-', 79);
 
   for(i=0; i<tape->length; i++)
   {
     if (i >= MAX_TAPELEN)
       break;
 
+    printf("%03d: ", i);
+
     for(j=0; j<MAX_PLAYERS; j++)
     {
       if (tape->player_participates[j])
@@ -1096,7 +1111,7 @@ void DumpTape(struct TapeInfo *tape)
     printf("(%03d)\n", tape->pos[i].delay);
   }
 
-  printf("-------------------------------------------------------------------------------\n");
+  printf_line('-', 79);
 }