added flag to tape files to explicitly mark solution tapes

diff --git a/src/files.c b/src/files.c
index 6839934a166cb2252154a2ad45024865a69e1f86..e8de1142ecf24f958da1c2b548b342472b0102c5 100644 (file)
--- 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_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
 #define TAPE_CHUNK_SCRN_SIZE   2       // size of screen size chunk
 
 #define SCORE_CHUNK_VERS_SIZE  8       // size of file version chunk


@@ -7887,6 +7886,7 @@ static void setTapeInfoToDefaults(void)
   tape.level_nr = level_nr;
   tape.counter = 0;
   tape.changed = FALSE;
   tape.level_nr = level_nr;
   tape.counter = 0;
   tape.changed = FALSE;

+  tape.solved = FALSE;

 
   tape.recording = FALSE;
   tape.playing = FALSE;
 
   tape.recording = FALSE;
   tape.playing = FALSE;


@@ -7973,8 +7973,7 @@ static int LoadTape_HEAD(File *file, int chunk_size, struct TapeInfo *tape)
     setTapeActionFlags(tape, getFile8Bit(file));
 
     tape->property_bits = getFile8Bit(file);
     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)
 
     engine_version = getFileVersion(file);
     if (engine_version > 0)


@@ -8419,9 +8418,7 @@ static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape)
   putFile8Bit(file, getTapeActionValue(tape));
 
   putFile8Bit(file, tape->property_bits);
   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);
 }
 
   putFileVersion(file, tape->engine_version);
 }


@@ -8603,6 +8600,10 @@ void DumpTape(struct TapeInfo *tape)
        tape->engine_version);
   Print("Level series identifier: '%s'\n", tape->level_identifier);
 
        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]");
   Print("Special tape properties: ");
   if (tape->property_bits == TAPE_PROPERTY_NONE)
     Print("[none]");

diff --git a/src/game.c b/src/game.c
index 4c4619c1e5bbc9e24ad51be93c846de9fa6b0a10..97617bb336003beddee02f2b2f1d37b73ea81d49 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -4777,6 +4777,8 @@ static void LevelSolved(void)
   game.LevelSolved = TRUE;
   game.GameOver = TRUE;
 
   game.LevelSolved = TRUE;
   game.GameOver = TRUE;
 

+  tape.solved = TRUE;
+

   // needed here to display correct panel values while player walks into exit
   LevelSolved_SetFinalGameValues();
 }
   // needed here to display correct panel values while player walks into exit
   LevelSolved_SetFinalGameValues();
 }

diff --git a/src/tape.c b/src/tape.c
index 3fb22a8d598369b9f6fbb3791fa8c33317c52829..240a149263f0116ab9588dd9265dcfca35c91ded 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -664,6 +664,7 @@ void TapeErase(void)
   tape.level_nr = level_nr;
   tape.pos[tape.counter].delay = 0;
   tape.changed = TRUE;
   tape.level_nr = level_nr;
   tape.pos[tape.counter].delay = 0;
   tape.changed = TRUE;

+  tape.solved = FALSE;

 
   tape.random_seed = InitRND(level.random_seed);
 
 
   tape.random_seed = InitRND(level.random_seed);
 


@@ -760,6 +761,7 @@ static void TapeAppendRecording(void)
   // start recording
   tape.recording = TRUE;
   tape.changed = TRUE;
   // start recording
   tape.recording = TRUE;
   tape.changed = TRUE;

+  tape.solved = FALSE;

 
   // set current delay (for last played move)
   tape.pos[tape.counter].delay = tape.delay_played;
 
   // set current delay (for last played move)
   tape.pos[tape.counter].delay = tape.delay_played;

diff --git a/src/tape.h b/src/tape.h
index c3b3a6deaab4af8452a12521572b5d73159c4f90..c4fba44dba2ba2351f33325e100a1a9f8b2838d2 100644 (file)
--- a/src/tape.h
+++ b/src/tape.h
@@ -210,6 +210,7 @@ struct TapeInfo
   boolean quick_resume;
   boolean single_step;
   boolean changed;
   boolean quick_resume;
   boolean single_step;
   boolean changed;

+  boolean solved;

   boolean player_participates[MAX_PLAYERS];
   int num_participating_players;
   int centered_player_nr_next;
   boolean player_participates[MAX_PLAYERS];
   int num_participating_players;
   int centered_player_nr_next;