X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=68eeaccf0cd1267159d239005ce76870d7b1e6a6;hb=08064fe872e3dd46ce0850b82fc535944f9bd0c2;hp=c14b21694940eea6c63844c1bd0e2f25285d4623;hpb=71f6982088deb38bae6506216004fcbe4caf6f9a;p=rocksndiamonds.git diff --git a/src/tape.c b/src/tape.c index c14b2169..68eeaccf 100644 --- a/src/tape.c +++ b/src/tape.c @@ -505,6 +505,8 @@ static void PrintTapeReplayHeader(struct AutoPlayInfo *autoplay) Print("Number of levels: %d\n", autoplay->leveldir->levels); PrintLine("=", 79); Print("\n"); + + DrawInitTextItem(autoplay->leveldir->name); } static void PrintTapeReplayProgress(boolean replay_finished) @@ -1357,6 +1359,26 @@ void FixTape_ForceSinglePlayer(void) // tape autoplay functions // ---------------------------------------------------------------------------- +static TreeInfo *getNextValidAutoPlayEntry(TreeInfo *node) +{ + node = getNextValidTreeInfoEntry(node); + + while (node && node->is_copy) + node = getNextValidTreeInfoEntry(node); + + return node; +} + +static TreeInfo *getFirstValidAutoPlayEntry(TreeInfo *node) +{ + node = getFirstValidTreeInfoEntry(node); + + if (node && node->is_copy) + return getNextValidAutoPlayEntry(node); + + return node; +} + static void AutoPlayTapes_SetScoreEntry(int score, int time) { // set unique basename for score tape (for uploading to score server) @@ -1396,6 +1418,8 @@ static void AutoPlayTapes_WaitForUpload(void) Fail("cannot upload score tape to score server"); } + UPDATE_BUSY_STATE(); + Delay(20); } @@ -1403,9 +1427,10 @@ static void AutoPlayTapes_WaitForUpload(void) 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[] = { @@ -1439,7 +1464,9 @@ static void AutoPlayTapesExt(boolean initialize) -1 }; + LevelDirTree *leveldir_current_last = leveldir_current; boolean init_level_set = FALSE; + int level_nr_last = level_nr; int i; if (!initialize) @@ -1504,6 +1531,7 @@ static void AutoPlayTapesExt(boolean initialize) // 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); @@ -1540,27 +1568,41 @@ static void AutoPlayTapesExt(boolean initialize) Fail("specify player name when uploading solution tapes"); } - DrawCompleteVideoDisplay(); + if (global.autoplay_mode != AUTOPLAY_MODE_UPLOAD) + DrawCompleteVideoDisplay(); - audio.sound_enabled = FALSE; - setup.engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_OFF); + if (program.headless) + { + audio.sound_enabled = FALSE; + setup.engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_OFF); + } if (strSuffix(global.autoplay_leveldir, ".tape")) { autoplay.tape_filename = global.autoplay_leveldir; + if (!fileExists(autoplay.tape_filename)) + Fail("tape file '%s' does not exist", autoplay.tape_filename); + LoadTapeFromFilename(autoplay.tape_filename); if (tape.no_valid_file) - { - if (!fileExists(autoplay.tape_filename)) - Fail("tape file '%s' does not exist", autoplay.tape_filename); - else - Fail("cannot load tape file '%s'", autoplay.tape_filename); - } + Fail("cannot load tape file '%s'", autoplay.tape_filename); + + if (tape.no_info_chunk && !options.identifier) + Fail("cannot get levelset from tape file '%s'", autoplay.tape_filename); + + if (tape.no_info_chunk && !options.level_nr) + Fail("cannot get level nr from tape file '%s'", autoplay.tape_filename); global.autoplay_leveldir = tape.level_identifier; + if (options.identifier != NULL) + global.autoplay_leveldir = options.identifier; + + if (options.level_nr != NULL) + tape.level_nr = atoi(options.level_nr); + if (tape.level_nr >= 0 && tape.level_nr < MAX_TAPES_PER_SET) global.autoplay_level[tape.level_nr] = TRUE; @@ -1570,7 +1612,7 @@ static void AutoPlayTapesExt(boolean initialize) if (autoplay.all_levelsets) { // start auto-playing first level set - autoplay.leveldir = getFirstValidTreeInfoEntry(leveldir_first); + autoplay.leveldir = getFirstValidAutoPlayEntry(leveldir_first); } else { @@ -1586,6 +1628,11 @@ static void AutoPlayTapesExt(boolean initialize) 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; } @@ -1618,6 +1665,8 @@ static void AutoPlayTapesExt(boolean initialize) if (global.autoplay_mode != AUTOPLAY_MODE_FIX || patch_nr == 0) level_nr = autoplay.level_nr++; + UPDATE_BUSY_STATE(); + // check if all tapes for this level set have been processed if (level_nr > autoplay.leveldir->last_level) { @@ -1627,7 +1676,7 @@ static void AutoPlayTapesExt(boolean initialize) break; // continue with next level set - autoplay.leveldir = getNextValidTreeInfoEntry(autoplay.leveldir); + autoplay.leveldir = getNextValidAutoPlayEntry(autoplay.leveldir); // all level sets processed if (autoplay.leveldir == NULL) @@ -1647,6 +1696,20 @@ static void AutoPlayTapesExt(boolean initialize) if (!global.autoplay_all && !global.autoplay_level[level_nr]) continue; + char *tape_filename = (autoplay.tape_filename ? autoplay.tape_filename : + options.mytapes ? getTapeFilename(level_nr) : + getSolutionTapeFilename(level_nr)); + + // speed things up in case of missing tapes (by skipping loading level) + if (!fileExists(tape_filename)) + { + autoplay.num_tape_missing++; + + Print("Tape %03d: (no tape found)\n", level_nr); + + continue; + } + TapeErase(); TapeRewind(); // needed to reset "tape.auto_play_level_solved" @@ -1676,7 +1739,7 @@ static void AutoPlayTapesExt(boolean initialize) { autoplay.num_tape_missing++; - Print("Tape %03d: (no tape found)\n", level_nr); + Print("Tape %03d: (invalid tape)\n", level_nr); continue; } @@ -1738,6 +1801,8 @@ static void AutoPlayTapesExt(boolean initialize) } } + num_tapes++; + if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD) { boolean use_temporary_tape_file = FALSE; @@ -1753,7 +1818,7 @@ static void AutoPlayTapesExt(boolean initialize) if (!fileExists(autoplay.tape_filename)) { - // non-standard solution tape -- save to temporary file + // non-standard or incorrect solution tape -- save to temporary file autoplay.tape_filename = getTemporaryTapeFilename(); SaveTapeToFilename(autoplay.tape_filename); @@ -1785,20 +1850,39 @@ static void AutoPlayTapesExt(boolean initialize) autoplay.last_level_nr = level_nr; - return; + return num_tapes; } - CloseAllAndExit(0); + if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD) + { + Print("\n"); + PrintLine("=", 79); + Print("SUMMARY: %d tapes uploaded.\n", num_tapes); + PrintLine("=", 79); + } + + // clear timestamp for batch tape upload (required after interactive upload) + global.autoplay_time = 0; + + // exit if running headless or if visually auto-playing tapes + if (program.headless || global.autoplay_mode != AUTOPLAY_MODE_UPLOAD) + CloseAllAndExit(0); + + // when running interactively, restore last selected level set and number + leveldir_current = leveldir_current_last; + level_nr = level_nr_last; + + 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); }