X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=68eeaccf0cd1267159d239005ce76870d7b1e6a6;hb=08064fe872e3dd46ce0850b82fc535944f9bd0c2;hp=63b9e402962925224d05a1f51f91f57cde8d647f;hpb=effd5d5c5bcf0edefb1bccf031510d9839d7789c;p=rocksndiamonds.git diff --git a/src/tape.c b/src/tape.c index 63b9e402..68eeaccf 100644 --- a/src/tape.c +++ b/src/tape.c @@ -474,7 +474,7 @@ void TapeDeactivateDisplayOff(boolean redraw_display) struct AutoPlayInfo { LevelDirTree *leveldir; - boolean initialized; + boolean all_levelsets; int last_level_nr; int level_nr; int num_levels_played; @@ -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"); } -void AutoPlayTapes(void) +static int AutoPlayTapesExt(boolean initialize) { static struct AutoPlayInfo autoplay; + static int num_tapes = 0; static int patch_nr = 0; static char *patch_name[] = { @@ -1439,9 +1464,12 @@ void AutoPlayTapes(void) -1 }; + LevelDirTree *leveldir_current_last = leveldir_current; + boolean init_level_set = FALSE; + int level_nr_last = level_nr; int i; - if (autoplay.initialized) + if (!initialize) { if (global.autoplay_mode == AUTOPLAY_MODE_FIX) { @@ -1503,6 +1531,7 @@ void AutoPlayTapes(void) // 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); @@ -1522,6 +1551,15 @@ void AutoPlayTapes(void) } else { + if (strEqual(global.autoplay_leveldir, "ALL")) + { + autoplay.all_levelsets = TRUE; + + // tape mass-uploading only allowed for private tapes + if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD) + options.mytapes = TRUE; + } + if ((global.autoplay_mode == AUTOPLAY_MODE_SAVE || global.autoplay_mode == AUTOPLAY_MODE_UPLOAD) && !options.mytapes && @@ -1530,67 +1568,124 @@ void AutoPlayTapes(void) 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; global.autoplay_all = FALSE; } - autoplay.leveldir = getTreeInfoFromIdentifier(leveldir_first, - global.autoplay_leveldir); + if (autoplay.all_levelsets) + { + // start auto-playing first level set + autoplay.leveldir = getFirstValidAutoPlayEntry(leveldir_first); + } + else + { + // auto-play selected level set + autoplay.leveldir = getTreeInfoFromIdentifier(leveldir_first, + global.autoplay_leveldir); + } if (autoplay.leveldir == NULL) Fail("no such level identifier: '%s'", global.autoplay_leveldir); - leveldir_current = autoplay.leveldir; - - if (autoplay.leveldir->first_level < 0) - autoplay.leveldir->first_level = 0; - if (autoplay.leveldir->last_level >= MAX_TAPES_PER_SET) - autoplay.leveldir->last_level = MAX_TAPES_PER_SET - 1; - - autoplay.level_nr = autoplay.leveldir->first_level; - - PrintTapeReplayHeader(&autoplay); - - for (i = 0; i < MAX_TAPES_PER_SET; i++) - autoplay.level_failed[i] = FALSE; - // only private tapes may be modified if (global.autoplay_mode == AUTOPLAY_MODE_FIX) options.mytapes = TRUE; - autoplay.initialized = TRUE; + // set timestamp for batch tape upload + global.autoplay_time = time(NULL); + + num_tapes = 0; + + init_level_set = TRUE; } while (1) { + if (init_level_set) + { + leveldir_current = autoplay.leveldir; + + if (autoplay.leveldir->first_level < 0) + autoplay.leveldir->first_level = 0; + if (autoplay.leveldir->last_level >= MAX_TAPES_PER_SET) + autoplay.leveldir->last_level = MAX_TAPES_PER_SET - 1; + + autoplay.level_nr = autoplay.leveldir->first_level; + + autoplay.num_levels_played = 0; + autoplay.num_levels_solved = 0; + autoplay.num_tapes_patched = 0; + autoplay.num_tape_missing = 0; + + for (i = 0; i < MAX_TAPES_PER_SET; i++) + autoplay.level_failed[i] = FALSE; + + PrintTapeReplayHeader(&autoplay); + + init_level_set = FALSE; + } + 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) - break; + { + PrintTapeReplaySummary(&autoplay); + + if (!autoplay.all_levelsets) + break; + + // continue with next level set + autoplay.leveldir = getNextValidAutoPlayEntry(autoplay.leveldir); + + // all level sets processed + if (autoplay.leveldir == NULL) + break; + + init_level_set = TRUE; + + continue; + } // set patch info (required for progress output) strcpy(tape_patch_info, ""); @@ -1601,7 +1696,22 @@ void AutoPlayTapes(void) 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" LoadLevel(level_nr); @@ -1629,7 +1739,7 @@ void AutoPlayTapes(void) { autoplay.num_tape_missing++; - Print("Tape %03d: (no tape found)\n", level_nr); + Print("Tape %03d: (invalid tape)\n", level_nr); continue; } @@ -1691,6 +1801,8 @@ void AutoPlayTapes(void) } } + num_tapes++; + if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD) { boolean use_temporary_tape_file = FALSE; @@ -1706,7 +1818,7 @@ void AutoPlayTapes(void) 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); @@ -1738,12 +1850,39 @@ void AutoPlayTapes(void) autoplay.last_level_nr = level_nr; - return; + return num_tapes; + } + + if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD) + { + Print("\n"); + PrintLine("=", 79); + Print("SUMMARY: %d tapes uploaded.\n", num_tapes); + PrintLine("=", 79); } - PrintTapeReplaySummary(&autoplay); + // clear timestamp for batch tape upload (required after interactive upload) + global.autoplay_time = 0; - CloseAllAndExit(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; +} + +int AutoPlayTapes(void) +{ + return AutoPlayTapesExt(TRUE); +} + +int AutoPlayTapesContinue(void) +{ + return AutoPlayTapesExt(FALSE); }