X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=1c691867378923c3b35a5093a0e98eb9c59cf2b5;hb=0feae4f4d0bc1f62266a0508306a87c78c6e41f9;hp=0c99d6802582ae5376635c932f585a5da959045f;hpb=411da92d158734699a25a7925a89f29b18fb373f;p=rocksndiamonds.git diff --git a/src/tape.c b/src/tape.c index 0c99d680..1c691867 100644 --- a/src/tape.c +++ b/src/tape.c @@ -312,7 +312,8 @@ static void DrawVideoDisplay_DateTime(unsigned int state, unsigned int value) char s[MAX_DATETIME_STRING_SIZE]; int year2 = value / 10000; int year4 = (year2 < 70 ? 2000 + year2 : 1900 + year2); - int month_index = (value / 100) % 100; + int month_index_raw = (value / 100) % 100; + int month_index = month_index_raw % 12; // prevent invalid index int month = month_index + 1; int day = value % 100; @@ -580,6 +581,8 @@ void TapeErase(void) tape.game_version = GAME_VERSION_ACTUAL; tape.engine_version = level.game_version; + tape.property_bits = TAPE_PROPERTY_NONE; + TapeSetDateFromNow(); for (i = 0; i < MAX_PLAYERS; i++) @@ -671,6 +674,8 @@ static void TapeAppendRecording(void) // set current delay (for last played move) tape.pos[tape.counter].delay = tape.delay_played; + tape.property_bits |= TAPE_PROPERTY_REPLAYED; + // set current date TapeSetDateFromNow(); @@ -761,6 +766,12 @@ void TapeRecordAction(byte action_raw[MAX_TAPE_ACTIONS]) tape.set_centered_player = FALSE; } + if (GameFrameDelay != GAME_FRAME_DELAY) + tape.property_bits |= TAPE_PROPERTY_GAME_SPEED; + + if (setup.small_game_graphics || SCR_FIELDX >= 2 * SCR_FIELDX_DEFAULT) + tape.property_bits |= TAPE_PROPERTY_SMALL_GRAPHICS; + if (!TapeAddAction(action)) TapeStopRecording(); } @@ -782,6 +793,12 @@ void TapeTogglePause(boolean toggle_mode) if (tape.single_step && (toggle_mode & TAPE_TOGGLE_MANUAL)) tape.single_step = FALSE; + if (tape.single_step) + tape.property_bits |= TAPE_PROPERTY_SINGLE_STEP; + + if (tape.pausing) + tape.property_bits |= TAPE_PROPERTY_PAUSE_MODE; + DrawVideoDisplayCurrentState(); if (tape.deactivate_display) @@ -1067,6 +1084,8 @@ void TapeQuickSave(void) return; } + tape.property_bits |= TAPE_PROPERTY_SNAPSHOT; + if (SaveTapeChecked(tape.level_nr)) SaveEngineSnapshotSingle(); } @@ -1125,6 +1144,7 @@ void TapeQuickLoad(void) TapeStartWarpForward(AUTOPLAY_MODE_WARP_NO_DISPLAY); tape.quick_resume = TRUE; + tape.property_bits |= TAPE_PROPERTY_SNAPSHOT; } else // this should not happen (basically checked above) { @@ -1249,6 +1269,52 @@ void FixTape_ForceSinglePlayer(void) // tape autoplay functions // ---------------------------------------------------------------------------- +static void AutoPlayTapes_SetScoreEntry(int score, int time) +{ + // set unique basename for score tape (for uploading to score server) + strcpy(tape.score_tape_basename, getScoreTapeBasename(setup.player_name)); + + // store score in first score entry + scores.last_added = 0; + + struct ScoreEntry *entry = &scores.entry[scores.last_added]; + + strncpy(entry->tape_basename, tape.score_tape_basename, MAX_FILENAME_LEN); + strncpy(entry->name, setup.player_name, MAX_PLAYER_NAME_LEN); + + entry->score = score; + entry->time = time; + + PrintNoLog("- uploading score tape to score server ... "); + + server_scores.uploaded = FALSE; +} + +static void AutoPlayTapes_WaitForUpload(void) +{ + unsigned int upload_delay = 0; + unsigned int upload_delay_value = 10000; + + ResetDelayCounter(&upload_delay); + + // wait for score tape to be successfully uploaded (and fail on timeout) + while (!server_scores.uploaded) + { + if (DelayReached(&upload_delay, upload_delay_value)) + { + PrintNoLog("\r"); + Print("- uploading score tape to score server - TIMEOUT.\n"); + + Fail("cannot upload score tape to score server"); + } + + Delay(20); + } + + PrintNoLog("\r"); + Print("- uploading score tape to score server - uploaded.\n"); +} + void AutoPlayTapes(void) { static LevelDirTree *autoplay_leveldir = NULL; @@ -1343,19 +1409,7 @@ void AutoPlayTapes(void) if (global.autoplay_mode == AUTOPLAY_MODE_SAVE && tape.auto_play_level_solved) { - // set unique basename for score tape (for uploading to score server) - strcpy(tape.score_tape_basename, getScoreTapeBasename(setup.player_name)); - - // store score in first score entry - scores.last_added = 0; - - struct ScoreEntry *entry = &scores.entry[scores.last_added]; - - strncpy(entry->tape_basename, tape.score_tape_basename, MAX_FILENAME_LEN); - strncpy(entry->name, setup.player_name, MAX_PLAYER_NAME_LEN); - - entry->score = game.score_final; - entry->time = game.score_time_final; + AutoPlayTapes_SetScoreEntry(game.score_final, game.score_time_final); if (leveldir_current) { @@ -1368,35 +1422,14 @@ void AutoPlayTapes(void) tape.level_nr = level_nr; } - PrintNoLog("- uploading score tape to score server ... "); + // save score tape to upload to server; may be required for some reasons: + // * level set identifier in solution tapes may differ from level set + // * solution tape may have native format (like Supaplex solution files) - server_scores.uploaded = FALSE; - - // temporarily save score tape (as the tape filename is unknown here) SaveScoreTape(level_nr); SaveServerScore(level_nr); - unsigned int upload_delay = 0; - unsigned int upload_delay_value = 10000; - - ResetDelayCounter(&upload_delay); - - // wait for score tape to be successfully uploaded (and fail on timeout) - while (!server_scores.uploaded) - { - if (DelayReached(&upload_delay, upload_delay_value)) - { - PrintNoLog("\r"); - Print("- uploading score tape to score server - TIMEOUT.\n"); - - Fail("cannot upload score tape to score server"); - } - - Delay(20); - } - - PrintNoLog("\r"); - Print("- uploading score tape to score server - uploaded.\n"); + AutoPlayTapes_WaitForUpload(); } if (patch_nr == 0) @@ -1421,6 +1454,14 @@ void AutoPlayTapes(void) LoadTapeFromFilename(tape_filename); + if (tape.no_valid_file) + { + if (!fileExists(tape_filename)) + Fail("tape file '%s' does not exist", tape_filename); + else + Fail("cannot load tape file '%s'", tape_filename); + } + global.autoplay_leveldir = tape.level_identifier; if (tape.level_nr >= 0 && tape.level_nr < MAX_TAPES_PER_SET) @@ -1447,6 +1488,8 @@ void AutoPlayTapes(void) PrintLine("=", 79); if (global.autoplay_mode == AUTOPLAY_MODE_FIX) Print("Automatically fixing level tapes\n"); + else if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD) + Print("Automatically uploading level tapes\n"); else Print("Automatically playing level tapes\n"); PrintLine("-", 79); @@ -1574,6 +1617,26 @@ void AutoPlayTapes(void) } } + if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD) + { + Print("Tape %03d:\n", level_nr); + + AutoPlayTapes_SetScoreEntry(0, 0); + + if (tape_filename == NULL) + tape_filename = (options.mytapes ? getTapeFilename(level_nr) : + getSolutionTapeFilename(level_nr)); + + SaveServerScoreFromFile(level_nr, tape_filename); + + AutoPlayTapes_WaitForUpload(); + + // required for uploading multiple tapes + tape_filename = NULL; + + continue; + } + InitCounter(); if (options.tape_log_filename != NULL)