moved code for fixing single-player tapes to separate function

[rocksndiamonds.git] / src / tape.c

diff --git a/src/tape.c b/src/tape.c
index 46fa236eaf460c098ebc9bb5a81e4e305cdf0595..29886a5c7346da27c25a3b3b5b538d0f8e982a5d 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -1145,6 +1145,22 @@ boolean PlaySolutionTape(void)
   return TRUE;
 }
 
+void FixTape_ForceSinglePlayer(void)
+{
+  int i;
+
+  /* fix single-player tapes that contain player input for more than one
+     player (due to a bug in 3.3.1.2 and earlier versions), which results
+     in playing levels with more than one player in multi-player mode,
+     even though the tape was originally recorded in single-player mode */
+
+  // remove player input actions for all players but the first one
+  for (i = 1; i < MAX_PLAYERS; i++)
+    tape.player_participates[i] = FALSE;
+
+  tape.changed = TRUE;
+}
+
 
 // ----------------------------------------------------------------------------
 // tape autoplay functions
@@ -1304,22 +1320,20 @@ void AutoPlayTapes(void)
     if (!global.autoplay_all && !global.autoplay_level[level_nr])
       continue;
 
-    Print("Tape %03d: ", level_nr);
-
     TapeErase();
 
     LoadLevel(level_nr);
 
     if (level.no_level_file || level.no_valid_file)
     {
-      Print("(no level found)\n");
+      Print("Tape %03d: (no level found)\n", level_nr);
 
       continue;
     }
 
 #if 0
     // ACTIVATE THIS FOR LOADING/TESTING OF LEVELS ONLY
-    Print("(only testing level)\n");
+    Print("Tape %03d: (only testing level)\n", level_nr);
     continue;
 #endif
 
@@ -1332,7 +1346,7 @@ void AutoPlayTapes(void)
     {
       num_tape_missing++;
 
-      Print("(no tape found)\n");
+      Print("Tape %03d: (no tape found)\n", level_nr);
 
       continue;
     }
@@ -1342,15 +1356,14 @@ void AutoPlayTapes(void)
       if (tape.engine_version < patch_version_first[patch_nr] ||
          tape.engine_version > patch_version_last[patch_nr])
       {
-       PrintNoLog("\r");
-       PrintNoLog("Tape %03d %s[%02d:%02d]: (%s %d.%d.%d.%d) - skipped.\n",
-                  level_nr,  tape_patch_info,
-                  tape.length_seconds / 60, tape.length_seconds % 60,
-                  "not suitable for version",
-                  (tape.engine_version / 1000000) % 100,
-                  (tape.engine_version / 10000  ) % 100,
-                  (tape.engine_version / 100    ) % 100,
-                  (tape.engine_version          ) % 100);
+       Print("Tape %03d %s[%02d:%02d]: (%s %d.%d.%d.%d) - skipped.\n",
+             level_nr,  tape_patch_info,
+             tape.length_seconds / 60, tape.length_seconds % 60,
+             "not suitable for version",
+             (tape.engine_version / 1000000) % 100,
+             (tape.engine_version / 10000  ) % 100,
+             (tape.engine_version / 100    ) % 100,
+             (tape.engine_version          ) % 100);
 
        if (patch_name[patch_nr + 1] != NULL)
        {