X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftape.c;h=2300f00b2d89b9f34015ca76998fbeac4de6e7e9;hp=46fa236eaf460c098ebc9bb5a81e4e305cdf0595;hb=580cc0293954391cf0cfd2f99638d8134f88f76c;hpb=e534f3cf4f5640bf422bb1484e1cc45c0a4b5339 diff --git a/src/tape.c b/src/tape.c index 46fa236e..2300f00b 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; // ============================================================================ @@ -456,6 +459,8 @@ void TapeDeactivateDisplayOff(boolean redraw_display) if (redraw_display) { RedrawPlayfield(); + + UpdateGameDoorValues(); DrawGameDoorValues(); } } @@ -528,6 +533,8 @@ void TapeErase(void) { int i; + CopyTapeToUndoBuffer(); + tape.counter = 0; tape.length = 0; tape.length_frames = 0; @@ -889,10 +896,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; @@ -950,7 +957,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 +1152,73 @@ 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) +{ + if (tape_to->level_identifier != NULL) + checked_free(tape_to->level_identifier); + + *tape_to = *tape_from; + + tape_to->level_identifier = getStringCopy(tape_from->level_identifier); +} + +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; + + /* fix single-player tapes that contain player input for more than one + player (due to a bug in 3.3.1.2 and earlier versions), which results + in playing levels with more than one player in multi-player mode, + even though the tape was originally recorded in single-player mode */ + + // remove player input actions for all players but the first one + for (i = 1; i < MAX_PLAYERS; i++) + tape.player_participates[i] = FALSE; + + tape.changed = TRUE; +} + // ---------------------------------------------------------------------------- // tape autoplay functions @@ -1165,6 +1239,7 @@ void AutoPlayTapes(void) { "original tape", "em_random_bug", + "screen_34x34", NULL }; @@ -1172,6 +1247,7 @@ void AutoPlayTapes(void) { VERSION_IDENT(0,0,0,0), VERSION_IDENT(3,3,1,0), + VERSION_IDENT(0,0,0,0), -1 }; @@ -1179,6 +1255,7 @@ void AutoPlayTapes(void) { VERSION_IDENT(9,9,9,9), VERSION_IDENT(4,0,1,1), + VERSION_IDENT(4,2,2,0), -1 }; @@ -1186,6 +1263,7 @@ void AutoPlayTapes(void) { TAPE_PROPERTY_NONE, TAPE_PROPERTY_EM_RANDOM_BUG, + TAPE_PROPERTY_NONE, -1 }; @@ -1252,8 +1330,7 @@ void AutoPlayTapes(void) 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; @@ -1304,22 +1381,20 @@ void AutoPlayTapes(void) if (!global.autoplay_all && !global.autoplay_level[level_nr]) continue; - Print("Tape %03d: ", level_nr); - TapeErase(); LoadLevel(level_nr); if (level.no_level_file || level.no_valid_file) { - Print("(no level found)\n"); + Print("Tape %03d: (no level found)\n", level_nr); continue; } #if 0 // ACTIVATE THIS FOR LOADING/TESTING OF LEVELS ONLY - Print("(only testing level)\n"); + Print("Tape %03d: (only testing level)\n", level_nr); continue; #endif @@ -1332,26 +1407,43 @@ void AutoPlayTapes(void) { num_tape_missing++; - Print("(no tape found)\n"); + Print("Tape %03d: (no tape found)\n", level_nr); continue; } 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]) { - PrintNoLog("\r"); - PrintNoLog("Tape %03d %s[%02d:%02d]: (%s %d.%d.%d.%d) - skipped.\n", - level_nr, tape_patch_info, - tape.length_seconds / 60, tape.length_seconds % 60, - "not suitable for version", - (tape.engine_version / 1000000) % 100, - (tape.engine_version / 10000 ) % 100, - (tape.engine_version / 100 ) % 100, - (tape.engine_version ) % 100); + Print("Tape %03d %s[%02d:%02d]: (%s %d.%d.%d.%d) - skipped.\n", + level_nr, tape_patch_info, + tape.length_seconds / 60, tape.length_seconds % 60, + "not suitable for version", + (tape.engine_version / 1000000) % 100, + (tape.engine_version / 10000 ) % 100, + (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 @@ -1366,7 +1458,15 @@ 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(); @@ -1425,14 +1525,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:")) { @@ -1446,6 +1546,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 { @@ -1454,22 +1589,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; } @@ -1486,6 +1628,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"); @@ -1498,8 +1641,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; @@ -1644,7 +1786,7 @@ void CreateTapeButtons(void) GDI_END); if (gi == NULL) - Error(ERR_EXIT, "cannot create gadget"); + Fail("cannot create gadget"); tape_gadget[id] = gi; }