X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=38edafc59d6503b61e167c97f1ec16c1f8aadbe5;hb=3256486ac61f3b7e213973f5dd441e01197ae971;hp=963ca1e89a6253b7a8f6d25fc9c264612395554c;hpb=33843542519f8ddc28d1ad563124b151cf79425c;p=rocksndiamonds.git diff --git a/src/tape.c b/src/tape.c index 963ca1e8..38edafc5 100644 --- a/src/tape.c +++ b/src/tape.c @@ -356,29 +356,38 @@ void DrawVideoDisplaySymbol(unsigned int state) DrawVideoDisplay(state, VIDEO_DISPLAY_SYMBOL_ONLY); } -void DrawVideoDisplayPlayState() +void DrawVideoDisplayCurrentState() { int state = 0; DrawVideoDisplay(VIDEO_STATE_OFF, 0); - state |= VIDEO_STATE_PLAY_ON; - if (tape.pausing) - { state |= VIDEO_STATE_PAUSE_ON; + + if (tape.recording) + { + state |= VIDEO_STATE_REC_ON; + + if (tape.single_step) + state |= VIDEO_STATE_1STEP_ON; } - else + else if (tape.playing) { - if (tape.deactivate_display) - state |= VIDEO_STATE_WARP2_ON; - else if (tape.warp_forward) - state |= VIDEO_STATE_WARP_ON; - else if (tape.fast_forward) - state |= VIDEO_STATE_FFWD_ON; + state |= VIDEO_STATE_PLAY_ON; - if (tape.pause_before_end) - state |= VIDEO_STATE_PBEND_ON; + if (!tape.pausing) + { + if (tape.deactivate_display) + state |= VIDEO_STATE_WARP2_ON; + else if (tape.warp_forward) + state |= VIDEO_STATE_WARP_ON; + else if (tape.fast_forward) + state |= VIDEO_STATE_FFWD_ON; + + if (tape.pause_before_end) + state |= VIDEO_STATE_PBEND_ON; + } } // draw labels and symbols separately to prevent labels overlapping symbols @@ -395,8 +404,7 @@ void DrawCompleteVideoDisplay() gfx.vxsize, gfx.vysize, gfx.vx, gfx.vy); /* draw tape buttons (forced) */ - UnmapTapeButtons(); - MapTapeButtons(); + RedrawOrRemapTapeButtons(); DrawVideoDisplay(VIDEO_ALL_OFF, 0); @@ -450,6 +458,44 @@ void TapeDeactivateDisplayOff(boolean redraw_display) } +/* ========================================================================= */ +/* tape logging functions */ +/* ========================================================================= */ + +void PrintTapeReplayProgress(boolean replay_finished) +{ + static unsigned int counter_last = -1; + unsigned int counter = Counter(); + unsigned int counter_seconds = counter / 1000; + + if (!replay_finished) + { + unsigned int counter_delay = 50; + + if (counter > counter_last + counter_delay) + { + PrintNoLog("\r"); + PrintNoLog("Level %03d [%02d:%02d]: [%02d:%02d] - playing tape ... ", + level_nr, tape.length_seconds / 60, tape.length_seconds % 60, + TapeTime / 60, TapeTime % 60); + + counter_last = counter; + } + } + else + { + PrintNoLog("\r"); + Print("Level %03d [%02d:%02d]: (%02d:%02d.%03d / %.2f %%) - %s.\n", + level_nr, tape.length_seconds / 60, tape.length_seconds % 60, + counter_seconds / 60, counter_seconds % 60, counter % 1000, + (float)counter / tape.length_seconds / 10, + tape.auto_play_level_solved ? "solved" : "NOT SOLVED"); + + counter_last = -1; + } +} + + /* ========================================================================= */ /* tape control functions */ /* ========================================================================= */ @@ -591,11 +637,11 @@ static void TapeAppendRecording() void TapeHaltRecording() { - if (!tape.recording) - return; - tape.counter++; - tape.pos[tape.counter].delay = 0; + + // initialize delay for next tape entry (to be able to continue recording) + if (tape.counter < MAX_TAPE_LEN) + tape.pos[tape.counter].delay = 0; tape.length = tape.counter; tape.length_frames = GetTapeLengthFrames(); @@ -604,7 +650,8 @@ void TapeHaltRecording() void TapeStopRecording() { - TapeHaltRecording(); + if (tape.recording) + TapeHaltRecording(); tape.recording = FALSE; tape.pausing = FALSE; @@ -613,6 +660,36 @@ void TapeStopRecording() MapTapeEjectButton(); } +void TapeAddAction(byte action[MAX_PLAYERS]) +{ + int i; + + if (tape.pos[tape.counter].delay > 0) /* already stored action */ + { + boolean changed_events = FALSE; + + for (i = 0; i < MAX_PLAYERS; i++) + if (tape.pos[tape.counter].action[i] != action[i]) + changed_events = TRUE; + + if (changed_events || tape.pos[tape.counter].delay >= 255) + { + tape.counter++; + tape.pos[tape.counter].delay = 0; + } + else + tape.pos[tape.counter].delay++; + } + + if (tape.pos[tape.counter].delay == 0) /* store new action */ + { + for (i = 0; i < MAX_PLAYERS; i++) + tape.pos[tape.counter].action[i] = action[i]; + + tape.pos[tape.counter].delay++; + } +} + void TapeRecordAction(byte action_raw[MAX_PLAYERS]) { byte action[MAX_PLAYERS]; @@ -640,40 +717,27 @@ void TapeRecordAction(byte action_raw[MAX_PLAYERS]) tape.set_centered_player = FALSE; } - if (tape.pos[tape.counter].delay > 0) /* already stored action */ - { - boolean changed_events = FALSE; - - for (i = 0; i < MAX_PLAYERS; i++) - if (tape.pos[tape.counter].action[i] != action[i]) - changed_events = TRUE; - - if (changed_events || tape.pos[tape.counter].delay >= 255) - { - tape.counter++; - tape.pos[tape.counter].delay = 0; - } - else - tape.pos[tape.counter].delay++; - } + TapeAddAction(action); +} - if (tape.pos[tape.counter].delay == 0) /* store new action */ +void TapeTogglePause(boolean toggle_mode) +{ + if (tape.playing && tape.pausing && (toggle_mode & TAPE_TOGGLE_PLAY_PAUSE)) { - for (i = 0; i < MAX_PLAYERS; i++) - tape.pos[tape.counter].action[i] = action[i]; + // continue playing in normal mode + tape.fast_forward = FALSE; + tape.warp_forward = FALSE; + tape.deactivate_display = FALSE; - tape.pos[tape.counter].delay++; + tape.pause_before_end = FALSE; } -} -void TapeTogglePause(boolean toggle_manual) -{ tape.pausing = !tape.pausing; - if (tape.single_step && toggle_manual) + if (tape.single_step && (toggle_mode & TAPE_TOGGLE_MANUAL)) tape.single_step = FALSE; - DrawVideoDisplayPlayState(); + DrawVideoDisplayCurrentState(); if (tape.deactivate_display) { @@ -695,6 +759,9 @@ void TapeTogglePause(boolean toggle_manual) // restart step/move snapshots after quick loading tape SaveEngineSnapshotToListInitial(); + + // do not map undo/redo buttons after quick loading tape + return; } if (setup.show_snapshot_buttons && @@ -836,6 +903,9 @@ byte *TapePlayAction() tape.delay_played = 0; } + if (tape.auto_play) + PrintTapeReplayProgress(FALSE); + return action; } @@ -873,17 +943,18 @@ unsigned int GetTapeLengthSeconds() return (GetTapeLengthFrames() * GAME_FRAME_DELAY / 1000); } -static void TapeStartWarpForward() +static void TapeStartWarpForward(int mode) { - tape.fast_forward = TRUE; - tape.warp_forward = TRUE; - tape.deactivate_display = TRUE; + tape.fast_forward = (mode & AUTOPLAY_FFWD); + tape.warp_forward = (mode & AUTOPLAY_WARP); + tape.deactivate_display = (mode & AUTOPLAY_WARP_NO_DISPLAY); tape.pausing = FALSE; - TapeDeactivateDisplayOn(); + if (tape.deactivate_display) + TapeDeactivateDisplayOn(); - DrawVideoDisplayPlayState(); + DrawVideoDisplayCurrentState(); } static void TapeStopWarpForward() @@ -896,7 +967,7 @@ static void TapeStopWarpForward() TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING); - DrawVideoDisplayPlayState(); + DrawVideoDisplayCurrentState(); } static void TapeSingleStep() @@ -989,7 +1060,7 @@ void TapeQuickLoad() if (!TAPE_IS_EMPTY(tape)) { TapeStartGamePlaying(); - TapeStartWarpForward(); + TapeStartWarpForward(AUTOPLAY_MODE_WARP_NO_DISPLAY); tape.quick_resume = TRUE; } @@ -1003,13 +1074,23 @@ void TapeQuickLoad() void InsertSolutionTape() { - if (!TAPE_IS_EMPTY(tape)) + boolean level_has_tape = (level.game_engine_type == GAME_ENGINE_TYPE_SP && + level.native_sp_level->demo.is_available); + + if (!fileExists(getSolutionTapeFilename(level_nr)) && !level_has_tape) + { + Request("No solution tape for this level!", REQ_CONFIRM); + return; + } + + // if tape recorder already contains a tape, remove it without asking + TapeErase(); LoadSolutionTape(level_nr); if (TAPE_IS_EMPTY(tape)) - Request("No solution tape for this level!", REQ_CONFIRM); + Request("Loading solution tape for this level failed!", REQ_CONFIRM); DrawCompleteVideoDisplay(); } @@ -1033,7 +1114,7 @@ void AutoPlayTape() if (autoplay_initialized) { /* just finished auto-playing tape */ - printf("%s.\n", tape.auto_play_level_solved ? "solved" : "NOT SOLVED"); + PrintTapeReplayProgress(TRUE); num_levels_played++; @@ -1065,15 +1146,15 @@ void AutoPlayTape() autoplay_level_nr = autoplay_leveldir->first_level; - printf_line("=", 79); - printf("Automatically playing level tapes\n"); - printf_line("-", 79); - printf("Level series identifier: '%s'\n", autoplay_leveldir->identifier); - printf("Level series name: '%s'\n", autoplay_leveldir->name); - printf("Level series author: '%s'\n", autoplay_leveldir->author); - printf("Number of levels: %d\n", autoplay_leveldir->levels); - printf_line("=", 79); - printf("\n"); + PrintLine("=", 79); + Print("Automatically playing level tapes\n"); + PrintLine("-", 79); + Print("Level series identifier: '%s'\n", autoplay_leveldir->identifier); + Print("Level series name: '%s'\n", autoplay_leveldir->name); + Print("Level series author: '%s'\n", autoplay_leveldir->author); + Print("Number of levels: %d\n", autoplay_leveldir->levels); + PrintLine("=", 79); + Print("\n"); for (i = 0; i < MAX_TAPES_PER_SET; i++) level_failed[i] = FALSE; @@ -1090,66 +1171,64 @@ void AutoPlayTape() TapeErase(); - printf("Level %03d: ", level_nr); - LoadLevel(level_nr); - if (level.no_valid_file) + + if (level.no_level_file || level.no_valid_file) { - printf("(no level)\n"); + Print("Level %03d: (no level)\n", level_nr); + continue; } #if 0 /* ACTIVATE THIS FOR LOADING/TESTING OF LEVELS ONLY */ - printf("(only testing level)\n"); + Print("Level %03d: (only testing level)\n", level_nr); continue; #endif - LoadSolutionTape(level_nr); + if (options.mytapes) + LoadTape(level_nr); + else + LoadSolutionTape(level_nr); if (tape.no_valid_file) { num_tape_missing++; - printf("(no tape)\n"); + Print("Level %03d: (no tape)\n", level_nr); continue; } - printf("playing tape ... "); + InitCounter(); TapeStartGamePlaying(); - - if (global.autoplay_mode == AUTOPLAY_FFWD) - tape.fast_forward = TRUE; - - if (global.autoplay_mode != AUTOPLAY_PLAY) - TapeStartWarpForward(); + TapeStartWarpForward(global.autoplay_mode); return; } - printf("\n"); - printf_line("=", 79); - printf("Number of levels played: %d\n", num_levels_played); - printf("Number of levels solved: %d (%d%%)\n", num_levels_solved, + Print("\n"); + PrintLine("=", 79); + Print("Number of levels played: %d\n", num_levels_played); + Print("Number of levels solved: %d (%d%%)\n", num_levels_solved, (num_levels_played ? num_levels_solved * 100 / num_levels_played :0)); - printf_line("-", 79); - printf("Summary (for automatic parsing by scripts):\n"); - printf("LEVELDIR '%s', SOLVED %d/%d (%d%%)", + PrintLine("-", 79); + Print("Summary (for automatic parsing by scripts):\n"); + Print("LEVELDIR '%s', SOLVED %d/%d (%d%%)", 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) { - printf(", FAILED:"); + Print(", FAILED:"); for (i = 0; i < MAX_TAPES_PER_SET; i++) if (level_failed[i]) - printf(" %03d", i); + Print(" %03d", i); } - printf("\n"); - printf_line("=", 79); + Print("\n"); + PrintLine("=", 79); CloseAllAndExit(0); } @@ -1275,6 +1354,34 @@ void UnmapTapeButtons() UnmapGameButtons(); } +void RedrawTapeButtons() +{ + int i; + + for (i = 0; i < NUM_TAPE_BUTTONS; i++) + RedrawGadget(tape_gadget[i]); + + if (tape.show_game_buttons) + RedrawGameButtons(); + + // RedrawGadget() may have set REDRAW_ALL if buttons are defined off-area + redraw_mask &= ~REDRAW_ALL; +} + +void RedrawOrRemapTapeButtons() +{ + if (tape_gadget[TAPE_CTRL_ID_PLAY]->mapped) + { + // tape buttons already mapped + RedrawTapeButtons(); + } + else + { + UnmapTapeButtons(); + MapTapeButtons(); + } +} + static void HandleTapeButtonsExt(int id) { if (game_status != GAME_MODE_MAIN && game_status != GAME_MODE_PLAYING) @@ -1295,7 +1402,7 @@ static void HandleTapeButtonsExt(int id) else { if (tape.changed) - SaveTapeChecked(tape.level_nr); + SaveTapeChecked(level_nr); TapeErase(); } @@ -1308,7 +1415,7 @@ static void HandleTapeButtonsExt(int id) { tape.pause_before_end = !tape.pause_before_end; - DrawVideoDisplayPlayState(); + DrawVideoDisplayCurrentState(); } else if (tape.recording) { @@ -1361,14 +1468,7 @@ static void HandleTapeButtonsExt(int id) { if (tape.pausing) /* PAUSE -> PLAY */ { - // continue playing in normal mode - tape.fast_forward = FALSE; - tape.warp_forward = FALSE; - tape.deactivate_display = FALSE; - - tape.pause_before_end = FALSE; - - TapeTogglePause(TAPE_TOGGLE_MANUAL); + TapeTogglePause(TAPE_TOGGLE_MANUAL | TAPE_TOGGLE_PLAY_PAUSE); } else if (!tape.fast_forward) /* PLAY -> FFWD */ { @@ -1393,7 +1493,7 @@ static void HandleTapeButtonsExt(int id) TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING); } - DrawVideoDisplayPlayState(); + DrawVideoDisplayCurrentState(); } break;