X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=6f424b12c161235976b20925b939794abdca9039;hb=fd952c79ba4afd593be9700c6d55ec4b707e2d70;hp=d6f89455405ea725b5c3de389cf4ed92960e5c23;hpb=d51197e00ec619213ee9c09714bafe855774ae8c;p=rocksndiamonds.git diff --git a/src/tape.c b/src/tape.c index d6f89455..6f424b12 100644 --- a/src/tape.c +++ b/src/tape.c @@ -459,6 +459,8 @@ void TapeDeactivateDisplayOff(boolean redraw_display) if (redraw_display) { RedrawPlayfield(); + + UpdateGameDoorValues(); DrawGameDoorValues(); } } @@ -538,8 +540,14 @@ void TapeErase(void) 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; @@ -1158,12 +1166,7 @@ static boolean checkTapesFromSameLevel(struct TapeInfo *t1, struct TapeInfo *t2) 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) @@ -1232,11 +1235,13 @@ void AutoPlayTapes(void) 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 }; @@ -1244,6 +1249,7 @@ void AutoPlayTapes(void) { VERSION_IDENT(0,0,0,0), VERSION_IDENT(3,3,1,0), + VERSION_IDENT(0,0,0,0), -1 }; @@ -1251,6 +1257,7 @@ void AutoPlayTapes(void) { VERSION_IDENT(9,9,9,9), VERSION_IDENT(4,0,1,1), + VERSION_IDENT(4,2,2,0), -1 }; @@ -1258,6 +1265,7 @@ void AutoPlayTapes(void) { TAPE_PROPERTY_NONE, TAPE_PROPERTY_EM_RANDOM_BUG, + TAPE_PROPERTY_NONE, -1 }; @@ -1320,6 +1328,20 @@ 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); @@ -1392,7 +1414,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); @@ -1408,6 +1432,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]) { @@ -1420,6 +1446,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 @@ -1434,7 +1476,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(); @@ -1455,7 +1505,8 @@ void AutoPlayTapes(void) 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"), + (num_levels_played == num_levels_solved && + num_levels_played > 0 ? " OK " : "WARN"), autoplay_leveldir->identifier, num_levels_solved, num_levels_played, (num_levels_played ? num_levels_solved * 100 / num_levels_played : 0)); @@ -1517,6 +1568,39 @@ static boolean PatchTape(struct TapeInfo *tape, char *mode) 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 { Print("Unknown patch mode '%s'!\n", mode); @@ -1563,6 +1647,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");