X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=5e95fb80f0cd908e4aeaa08800cd14b2c7738dd3;hb=51370f0989549a08361b8f2939dbfec9b625b6a9;hp=09e3b4d2256fcfe7d7cee4b6c655070f57aee90b;hpb=b137e7481391c30c99dc23abea8762a0bbeac1e3;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 09e3b4d2..5e95fb80 100644
--- a/src/files.c
+++ b/src/files.c
@@ -60,7 +60,6 @@
 
 #define TAPE_CHUNK_VERS_SIZE	8	// size of file version chunk
 #define TAPE_CHUNK_HEAD_SIZE	20	// size of tape file header
-#define TAPE_CHUNK_HEAD_UNUSED	1	// unused tape header bytes
 #define TAPE_CHUNK_SCRN_SIZE	2	// size of screen size chunk
 
 #define SCORE_CHUNK_VERS_SIZE	8	// size of file version chunk
@@ -3355,6 +3354,10 @@ static int LoadLevel_CUSX(File *file, int chunk_size, struct LevelInfo *level)
 
   while (!checkEndOfFile(file))
   {
+    // level file might contain invalid change page number
+    if (xx_current_change_page >= ei->num_change_pages)
+      break;
+
     struct ElementChangeInfo *change = &ei->change_page[xx_current_change_page];
 
     xx_change = *change;	// copy change data into temporary buffer
@@ -3384,6 +3387,9 @@ static int LoadLevel_GRPX(File *file, int chunk_size, struct LevelInfo *level)
   struct ElementInfo *ei = &element_info[element];
   struct ElementGroupInfo *group = ei->group;
 
+  if (group == NULL)
+    return -1;
+
   xx_ei = *ei;		// copy element data into temporary buffer
   xx_group = *group;	// copy group data into temporary buffer
 
@@ -3584,6 +3590,14 @@ static void LoadLevelFromFileInfo_RND(struct LevelInfo *level,
 	int chunk_size_expected =
 	  (chunk_info[i].loader)(file, chunk_size, level);
 
+	if (chunk_size_expected < 0)
+	{
+	  Warn("error reading chunk '%s' in level file '%s'",
+	       chunk_name, filename);
+
+	  break;
+	}
+
 	// the size of some chunks cannot be checked before reading other
 	// chunks first (like "HEAD" and "BODY") that contain some header
 	// information, so check them here
@@ -3591,6 +3605,8 @@ static void LoadLevelFromFileInfo_RND(struct LevelInfo *level,
 	{
 	  Warn("wrong size (%d) of chunk '%s' in level file '%s'",
 	       chunk_size, chunk_name, filename);
+
+	  break;
 	}
       }
     }
@@ -7870,6 +7886,7 @@ static void setTapeInfoToDefaults(void)
   tape.level_nr = level_nr;
   tape.counter = 0;
   tape.changed = FALSE;
+  tape.solved = FALSE;
 
   tape.recording = FALSE;
   tape.playing = FALSE;
@@ -7956,8 +7973,7 @@ static int LoadTape_HEAD(File *file, int chunk_size, struct TapeInfo *tape)
     setTapeActionFlags(tape, getFile8Bit(file));
 
     tape->property_bits = getFile8Bit(file);
-
-    ReadUnusedBytesFromFile(file, TAPE_CHUNK_HEAD_UNUSED);
+    tape->solved = getFile8Bit(file);
 
     engine_version = getFileVersion(file);
     if (engine_version > 0)
@@ -8402,9 +8418,7 @@ static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape)
   putFile8Bit(file, getTapeActionValue(tape));
 
   putFile8Bit(file, tape->property_bits);
-
-  // unused bytes not at the end here for 4-byte alignment of engine_version
-  WriteUnusedBytesToFile(file, TAPE_CHUNK_HEAD_UNUSED);
+  putFile8Bit(file, tape->solved);
 
   putFileVersion(file, tape->engine_version);
 }
@@ -8586,6 +8600,10 @@ void DumpTape(struct TapeInfo *tape)
 	tape->engine_version);
   Print("Level series identifier: '%s'\n", tape->level_identifier);
 
+  Print("Solution tape: %s\n",
+	tape->solved ? "yes" :
+	tape->game_version < VERSION_IDENT(4,3,2,3) ? "unknown" : "no");
+
   Print("Special tape properties: ");
   if (tape->property_bits == TAPE_PROPERTY_NONE)
     Print("[none]");
@@ -13471,7 +13489,7 @@ void CreateCollectElementImages(void)
 		  SDL_MapRGB(dst_bitmap->surface->format, 0x00, 0x00, 0x00));
 
   dst_bitmap->surface =
-    SDL_ConvertSurfaceFormat(dst_bitmap->surface, SDL_PIXELFORMAT_RGBA32, 0);
+    SDL_ConvertSurfaceFormat(dst_bitmap->surface, SDL_PIXELFORMAT_ARGB8888, 0);
 
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
@@ -13498,7 +13516,7 @@ void CreateCollectElementImages(void)
 		    SDL_MapRGB(tmp_bitmap->surface->format, 0x00, 0x00, 0x00));
 
     tmp_bitmap->surface =
-      SDL_ConvertSurfaceFormat(tmp_bitmap->surface, SDL_PIXELFORMAT_RGBA32, 0);
+      SDL_ConvertSurfaceFormat(tmp_bitmap->surface, SDL_PIXELFORMAT_ARGB8888, 0);
 
     tmp_bitmap->surface_masked = tmp_bitmap->surface;
 
@@ -13541,7 +13559,9 @@ void CreateCollectElementImages(void)
 
   Info("Converting image file from BMP to PNG ...");
 
-  system(cmd_convert);
+  if (system(cmd_convert) != 0)
+    Fail("converting image file failed");
+
   unlink(filename_bmp);
 
   Info("Done.");