X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=449e79601bd399949549390286a977873d581ac8;hb=3f22ee3ec11b053261ba98f08d29ed71f2d1c232;hp=29886a5c7346da27c25a3b3b5b538d0f8e982a5d;hpb=97648ab29c587dee3e5fa5be3cc0cfda96543f22;p=rocksndiamonds.git diff --git a/src/tape.c b/src/tape.c index 29886a5c..449e7960 100644 --- a/src/tape.c +++ b/src/tape.c @@ -35,13 +35,16 @@ // values for tape handling #define TAPE_PAUSE_SECONDS_BEFORE_DEATH 5 +#define TAPE_MIN_SECONDS_FOR_UNDO_BUFFER 20 // forward declaration for internal use static void HandleTapeButtons(struct GadgetInfo *); static void TapeStopWarpForward(void); static float GetTapeLengthSecondsFloat(void); +static void CopyTapeToUndoBuffer(void); static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS]; +static struct TapeInfo tape_undo_buffer; // ============================================================================ @@ -309,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; @@ -456,6 +460,8 @@ void TapeDeactivateDisplayOff(boolean redraw_display) if (redraw_display) { RedrawPlayfield(); + + UpdateGameDoorValues(); DrawGameDoorValues(); } } @@ -507,6 +513,27 @@ static void PrintTapeReplayProgress(boolean replay_finished) } } +static FILE *tape_log_file; + +static void OpenTapeLogfile(void) +{ + if (!(tape_log_file = fopen(options.tape_log_filename, MODE_WRITE))) + Warn("cannot write tape logfile '%s'", options.tape_log_filename); +} + +static void WriteTapeLogfile(byte action[MAX_TAPE_ACTIONS]) +{ + int i; + + for (i = 0; i < MAX_TAPE_ACTIONS; i++) + putFile8Bit(tape_log_file, action[i]); +} + +static void CloseTapeLogfile(void) +{ + fclose(tape_log_file); +} + // ============================================================================ // tape control functions @@ -528,13 +555,21 @@ void TapeErase(void) { int i; + CopyTapeToUndoBuffer(); + tape.counter = 0; tape.length = 0; tape.length_frames = 0; tape.length_seconds = 0; + tape.score_tape_basename[0] = '\0'; + if (leveldir_current) - setString(&tape.level_identifier, leveldir_current->identifier); + { + strncpy(tape.level_identifier, leveldir_current->identifier, + MAX_FILENAME_LEN); + tape.level_identifier[MAX_FILENAME_LEN] = '\0'; + } tape.level_nr = level_nr; tape.pos[tape.counter].delay = 0; @@ -889,10 +924,10 @@ byte *TapePlayAction(void) action[i] = tape.pos[tape.counter].action[i]; #if DEBUG_TAPE_WHEN_PLAYING - printf("%05d", FrameCounter); + DebugContinued("", "%05d", FrameCounter); for (i = 0; i < MAX_TAPE_ACTIONS; i++) - printf(" %08x", action[i]); - printf("\n"); + DebugContinued("", " %08x", action[i]); + DebugContinued("tape:play", "\n"); #endif tape.set_centered_player = FALSE; @@ -923,6 +958,9 @@ byte *TapePlayAction(void) if (tape.auto_play) PrintTapeReplayProgress(FALSE); + if (options.tape_log_filename != NULL) + WriteTapeLogfile(action); + return action; } @@ -950,7 +988,7 @@ unsigned int GetTapeLengthFrames(void) int i; if (TAPE_IS_EMPTY(tape)) - return(0); + return 0; for (i = 0; i < tape.length; i++) tape_length_frames += tape.pos[i].delay; @@ -1145,6 +1183,52 @@ boolean PlaySolutionTape(void) return TRUE; } +static boolean checkTapesFromSameLevel(struct TapeInfo *t1, struct TapeInfo *t2) +{ + return (strEqual(t1->level_identifier, t2->level_identifier) && + t1->level_nr == t2->level_nr); +} + +static void CopyTape(struct TapeInfo *tape_from, struct TapeInfo *tape_to) +{ + *tape_to = *tape_from; +} + +static void SwapTapes(struct TapeInfo *t1, struct TapeInfo *t2) +{ + struct TapeInfo tmp = *t1; + + *t1 = *t2; + *t2 = tmp; +} + +static void CopyTapeToUndoBuffer(void) +{ + // copy tapes to undo buffer if large enough (or larger than last undo tape) + // or if the last undo tape is from a different level set or level number + if (tape.length_seconds >= TAPE_MIN_SECONDS_FOR_UNDO_BUFFER || + tape.length_seconds >= tape_undo_buffer.length_seconds || + !checkTapesFromSameLevel(&tape, &tape_undo_buffer)) + { + CopyTape(&tape, &tape_undo_buffer); + } +} + +void UndoTape(void) +{ + // only undo tapes from same level set and with same level number + if (!checkTapesFromSameLevel(&tape, &tape_undo_buffer)) + return; + + if (!TAPE_IS_STOPPED(tape)) + TapeStop(); + + // swap last recorded tape with undo buffer, so undo can be reversed + SwapTapes(&tape, &tape_undo_buffer); + + DrawCompleteVideoDisplay(); +} + void FixTape_ForceSinglePlayer(void) { int i; @@ -1170,17 +1254,20 @@ void AutoPlayTapes(void) { static LevelDirTree *autoplay_leveldir = NULL; static boolean autoplay_initialized = FALSE; + static int autoplay_last_level_nr = -1; static int autoplay_level_nr = -1; static int num_levels_played = 0; static int num_levels_solved = 0; static int num_tapes_patched = 0; static int num_tape_missing = 0; static boolean level_failed[MAX_TAPES_PER_SET]; + static char *tape_filename = NULL; static int patch_nr = 0; static char *patch_name[] = { "original tape", "em_random_bug", + "screen_34x34", NULL }; @@ -1188,6 +1275,7 @@ void AutoPlayTapes(void) { VERSION_IDENT(0,0,0,0), VERSION_IDENT(3,3,1,0), + VERSION_IDENT(0,0,0,0), -1 }; @@ -1195,6 +1283,7 @@ void AutoPlayTapes(void) { VERSION_IDENT(9,9,9,9), VERSION_IDENT(4,0,1,1), + VERSION_IDENT(4,2,2,0), -1 }; @@ -1202,6 +1291,7 @@ void AutoPlayTapes(void) { TAPE_PROPERTY_NONE, TAPE_PROPERTY_EM_RANDOM_BUG, + TAPE_PROPERTY_NONE, -1 }; @@ -1248,6 +1338,68 @@ void AutoPlayTapes(void) // just finished auto-playing tape PrintTapeReplayProgress(TRUE); + if (options.tape_log_filename != NULL) + CloseTapeLogfile(); + + 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; + + if (leveldir_current) + { + // the tape's level set identifier may differ from current level set + strncpy(tape.level_identifier, leveldir_current->identifier, + MAX_FILENAME_LEN); + tape.level_identifier[MAX_FILENAME_LEN] = '\0'; + + // the tape's level number may differ from current level number + tape.level_nr = level_nr; + } + + PrintNoLog("- uploading score tape to score server ... "); + + 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"); + } + if (patch_nr == 0) num_levels_played++; @@ -1264,12 +1416,25 @@ void AutoPlayTapes(void) audio.sound_enabled = FALSE; setup.engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_OFF); + if (strSuffix(global.autoplay_leveldir, ".tape")) + { + tape_filename = global.autoplay_leveldir; + + LoadTapeFromFilename(tape_filename); + + global.autoplay_leveldir = tape.level_identifier; + + 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_leveldir == NULL) - Error(ERR_EXIT, "no such level identifier: '%s'", - global.autoplay_leveldir); + Fail("no such level identifier: '%s'", global.autoplay_leveldir); leveldir_current = autoplay_leveldir; @@ -1337,7 +1502,9 @@ void AutoPlayTapes(void) continue; #endif - if (options.mytapes) + if (tape_filename) + LoadTapeFromFilename(tape_filename); + else if (options.mytapes) LoadTape(level_nr); else LoadSolutionTape(level_nr); @@ -1353,6 +1520,8 @@ void AutoPlayTapes(void) if (global.autoplay_mode == AUTOPLAY_MODE_FIX) { + boolean skip_patch = FALSE; + if (tape.engine_version < patch_version_first[patch_nr] || tape.engine_version > patch_version_last[patch_nr]) { @@ -1365,6 +1534,22 @@ void AutoPlayTapes(void) (tape.engine_version / 100 ) % 100, (tape.engine_version ) % 100); + skip_patch = TRUE; + } + + if (strEqual(patch_name[patch_nr], "screen_34x34") && + tape.num_participating_players == 1) + { + Print("Tape %03d %s[%02d:%02d]: (%s) - skipped.\n", + level_nr, tape_patch_info, + tape.length_seconds / 60, tape.length_seconds % 60, + "not suitable for single player tapes"); + + skip_patch = TRUE; + } + + if (skip_patch) + { if (patch_name[patch_nr + 1] != NULL) { // continue with next patch @@ -1379,17 +1564,35 @@ void AutoPlayTapes(void) continue; } - tape.property_bits |= patch_property_bit[patch_nr]; + if (strEqual(patch_name[patch_nr], "screen_34x34")) + { + tape.scr_fieldx = SCR_FIELDX_DEFAULT * 2; + tape.scr_fieldy = SCR_FIELDY_DEFAULT * 2; + } + else + { + tape.property_bits |= patch_property_bit[patch_nr]; + } } InitCounter(); + if (options.tape_log_filename != NULL) + OpenTapeLogfile(); + TapeStartGamePlaying(); TapeStartWarpForward(global.autoplay_mode); + autoplay_last_level_nr = level_nr; + return; } + char *autoplay_status = (num_levels_played == num_levels_solved && + num_levels_played > 0 ? " OK " : "WARN"); + int autoplay_percent = (num_levels_played ? + num_levels_solved * 100 / num_levels_played : 0); + Print("\n"); PrintLine("=", 79); Print("Number of levels played: %d\n", num_levels_played); @@ -1399,17 +1602,32 @@ void AutoPlayTapes(void) Print("Number of tapes fixed: %d\n", num_tapes_patched); PrintLine("-", 79); Print("Summary (for automatic parsing by scripts):\n"); - Print("LEVELDIR [%s] '%s', SOLVED %d/%d (%d%%)", - (num_levels_played == num_levels_solved ? " OK " : "WARN"), - autoplay_leveldir->identifier, num_levels_solved, num_levels_played, - (num_levels_played ? num_levels_solved * 100 / num_levels_played : 0)); - if (num_levels_played != num_levels_solved) + if (tape_filename) { - Print(", FAILED:"); - for (i = 0; i < MAX_TAPES_PER_SET; i++) - if (level_failed[i]) - Print(" %03d", i); + Print("TAPEFILE [%s] '%s', %d, %d, %d", + autoplay_status, + autoplay_leveldir->identifier, + autoplay_last_level_nr, + game.score_final, + game.score_time_final); + } + else + { + Print("LEVELDIR [%s] '%s', SOLVED %d/%d (%d%%)", + autoplay_status, + autoplay_leveldir->identifier, + num_levels_solved, + num_levels_played, + autoplay_percent); + + if (num_levels_played != num_levels_solved) + { + Print(", FAILED:"); + for (i = 0; i < MAX_TAPES_PER_SET; i++) + if (level_failed[i]) + Print(" %03d", i); + } } Print("\n"); @@ -1438,14 +1656,14 @@ static boolean PatchTape(struct TapeInfo *tape, char *mode) return FALSE; } - byte property_bits = tape->property_bits; + boolean unpatch_tape = FALSE; + boolean use_property_bit = FALSE; byte property_bitmask = 0; - boolean set_property_bit = TRUE; if (strSuffix(mode, ":0") || strSuffix(mode, ":off") || strSuffix(mode, ":clear")) - set_property_bit = FALSE; + unpatch_tape = TRUE; if (strEqual(mode, "em_random_bug") || strPrefix(mode, "em_random_bug:")) { @@ -1459,6 +1677,41 @@ static boolean PatchTape(struct TapeInfo *tape, char *mode) } property_bitmask = TAPE_PROPERTY_EM_RANDOM_BUG; + + use_property_bit = TRUE; + } + else if (strEqual(mode, "screen_34x34") || strPrefix(mode, "screen_34x34:")) + { + // this bug only affects team mode tapes + if (tape->num_participating_players == 1) + { + Print("Only team mode tapes can be patched against screen size bug!\n"); + + return FALSE; + } + + // this bug (that always existed before) was fixed in version 4.2.2.1 + if (tape->engine_version >= VERSION_IDENT(4,2,2,1)) + { + Print("This tape version cannot be patched against screen size bug!\n"); + + return FALSE; + } + + int factor = (unpatch_tape ? 1 : 2); + int scr_fieldx_new = SCR_FIELDX_DEFAULT * factor; + int scr_fieldy_new = SCR_FIELDY_DEFAULT * factor; + + if (scr_fieldx_new == tape->scr_fieldx && + scr_fieldy_new == tape->scr_fieldy) + { + Print("Tape already patched for '%s'!\n", mode); + + return FALSE; + } + + tape->scr_fieldx = scr_fieldx_new; + tape->scr_fieldy = scr_fieldy_new; } else { @@ -1467,22 +1720,29 @@ static boolean PatchTape(struct TapeInfo *tape, char *mode) return FALSE; } - if (set_property_bit) - property_bits |= property_bitmask; - else - property_bits &= ~property_bitmask; - - if (property_bits == tape->property_bits) + // patching tapes using property bits may be used for several patch modes + if (use_property_bit) { - Print("Tape already patched for '%s'!\n", mode); + byte property_bits = tape->property_bits; + boolean set_property_bit = (unpatch_tape ? FALSE : TRUE); - return FALSE; + if (set_property_bit) + property_bits |= property_bitmask; + else + property_bits &= ~property_bitmask; + + if (property_bits == tape->property_bits) + { + Print("Tape already patched for '%s'!\n", mode); + + return FALSE; + } + + tape->property_bits = property_bits; } Print("Patching for '%s' ... ", mode); - tape->property_bits = property_bits; - return TRUE; } @@ -1499,6 +1759,7 @@ void PatchTapes(void) PrintLine("=", 79); Print("Supported patch modes:\n"); Print("- \"em_random_bug\" - use 64-bit random value bug for EM engine\n"); + Print("- \"screen_34x34\" - force visible playfield size of 34 x 34\n"); PrintLine("-", 79); Print("Supported modifiers:\n"); Print("- add \":0\", \":off\" or \":clear\" to patch mode to un-patch tape file\n"); @@ -1511,8 +1772,7 @@ void PatchTapes(void) global.patchtapes_leveldir); if (patchtapes_leveldir == NULL) - Error(ERR_EXIT, "no such level identifier: '%s'", - global.patchtapes_leveldir); + Fail("no such level identifier: '%s'", global.patchtapes_leveldir); leveldir_current = patchtapes_leveldir; @@ -1657,7 +1917,7 @@ void CreateTapeButtons(void) GDI_END); if (gi == NULL) - Error(ERR_EXIT, "cannot create gadget"); + Fail("cannot create gadget"); tape_gadget[id] = gi; }