Print("- uploading score tape to score server - uploaded.\n");
}
-static void AutoPlayTapesExt(boolean initialize)
+static int AutoPlayTapesExt(boolean initialize)
{
static struct AutoPlayInfo autoplay;
+ static int num_tapes = 0;
static int patch_nr = 0;
static char *patch_name[] =
{
// save score tape to upload to server; may be required for some reasons:
// * level set identifier in solution tapes may differ from level set
+ // * level set identifier is missing (old-style tape without INFO chunk)
// * solution tape may have native format (like Supaplex solution files)
SaveScoreTape(level_nr);
if (global.autoplay_mode == AUTOPLAY_MODE_FIX)
options.mytapes = TRUE;
+ // set timestamp for batch tape upload
+ global.autoplay_time = time(NULL);
+
+ num_tapes = 0;
+
init_level_set = TRUE;
}
}
}
+ num_tapes++;
+
if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
{
boolean use_temporary_tape_file = FALSE;
autoplay.tape_filename = (options.mytapes ? getTapeFilename(level_nr) :
getDefaultSolutionTapeFilename(level_nr));
- if (!fileExists(autoplay.tape_filename))
+ boolean correct_info_chunk =
+ (strEqual(leveldir_current->identifier, tape.level_identifier) &&
+ level_nr == tape.level_nr);
+
+ if (!correct_info_chunk)
{
- // non-standard solution tape -- save to temporary file
+ strncpy(tape.level_identifier, leveldir_current->identifier,
+ MAX_FILENAME_LEN);
+ tape.level_identifier[MAX_FILENAME_LEN] = '\0';
+ tape.level_nr = level_nr;
+ }
+
+ if (!fileExists(autoplay.tape_filename) || !correct_info_chunk)
+ {
+ // non-standard or incorrect solution tape -- save to temporary file
autoplay.tape_filename = getTemporaryTapeFilename();
SaveTapeToFilename(autoplay.tape_filename);
autoplay.last_level_nr = level_nr;
- return;
+ return num_tapes;
}
+ // clear timestamp for batch tape upload (required after interactive upload)
+ global.autoplay_time = 0;
+
if (program.headless)
CloseAllAndExit(0);
+
+ return num_tapes;
}
-void AutoPlayTapes(void)
+int AutoPlayTapes(void)
{
- AutoPlayTapesExt(TRUE);
+ return AutoPlayTapesExt(TRUE);
}
-void AutoPlayTapesContinue(void)
+int AutoPlayTapesContinue(void)
{
- AutoPlayTapesExt(FALSE);
+ return AutoPlayTapesExt(FALSE);
}