X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=d77703295f3fcb5ee69619d658bd713de42e36b5;hb=5a4a6f4051fc89de7e47cf41d4d3e78dab4283d6;hp=63b9e402962925224d05a1f51f91f57cde8d647f;hpb=effd5d5c5bcf0edefb1bccf031510d9839d7789c;p=rocksndiamonds.git diff --git a/src/tape.c b/src/tape.c index 63b9e402..d7770329 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,10 @@ void AutoPlayTapes(void) -1 }; + boolean init_level_set = FALSE; int i; - if (autoplay.initialized) + if (!initialize) { if (global.autoplay_mode == AUTOPLAY_MODE_FIX) { @@ -1503,6 +1529,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 +1549,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,10 +1566,14 @@ 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")) { @@ -1549,6 +1589,9 @@ void AutoPlayTapes(void) Fail("cannot load tape file '%s'", autoplay.tape_filename); } + if (tape.no_info_chunk) + Fail("cannot get levelset from tape file '%s'", autoplay.tape_filename); + global.autoplay_leveldir = tape.level_identifier; if (tape.level_nr >= 0 && tape.level_nr < MAX_TAPES_PER_SET) @@ -1557,40 +1600,83 @@ void AutoPlayTapes(void) 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, ""); @@ -1602,6 +1688,7 @@ void AutoPlayTapes(void) continue; TapeErase(); + TapeRewind(); // needed to reset "tape.auto_play_level_solved" LoadLevel(level_nr); @@ -1691,6 +1778,8 @@ void AutoPlayTapes(void) } } + num_tapes++; + if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD) { boolean use_temporary_tape_file = FALSE; @@ -1704,9 +1793,21 @@ void AutoPlayTapes(void) 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); @@ -1738,12 +1839,26 @@ void AutoPlayTapes(void) autoplay.last_level_nr = level_nr; - return; + return num_tapes; } - PrintTapeReplaySummary(&autoplay); + // clear timestamp for batch tape upload (required after interactive upload) + global.autoplay_time = 0; - CloseAllAndExit(0); + if (program.headless) + CloseAllAndExit(0); + + return num_tapes; +} + +int AutoPlayTapes(void) +{ + return AutoPlayTapesExt(TRUE); +} + +int AutoPlayTapesContinue(void) +{ + return AutoPlayTapesExt(FALSE); }