X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftape.c;h=a8ac4cea12a6d9974f541302ac0f85fb3e782abc;hp=ded004fc2a16eb33227a455383fa9f47aa754dee;hb=0d02210d139e2e889d91d80015d54c5186dc347b;hpb=ca2a6ad31f7d41df73e3a45800eb92f7924c446c diff --git a/src/tape.c b/src/tape.c index ded004fc..a8ac4cea 100644 --- a/src/tape.c +++ b/src/tape.c @@ -17,7 +17,7 @@ #include "tools.h" #include "files.h" #include "network.h" -#include "cartoons.h" +#include "anim.h" #define DEBUG_TAPE_WHEN_PLAYING FALSE @@ -45,99 +45,6 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS]; /* video tape definitions */ /* ========================================================================= */ -/* some positions in the video tape control window */ -#define VIDEO_DATE_LABEL_XPOS (VIDEO_DISPLAY1_XPOS) -#define VIDEO_DATE_LABEL_YPOS (VIDEO_DISPLAY1_YPOS) -#define VIDEO_DATE_LABEL_XSIZE (VIDEO_DISPLAY_XSIZE) -#define VIDEO_DATE_LABEL_YSIZE (VIDEO_DISPLAY_YSIZE) -#define VIDEO_DATE_XPOS (VIDEO_DISPLAY1_XPOS + 2) -#define VIDEO_DATE_YPOS (VIDEO_DISPLAY1_YPOS + 14) -#define VIDEO_DATE_XSIZE (VIDEO_DISPLAY_XSIZE) -#define VIDEO_DATE_YSIZE 16 -#define VIDEO_REC_LABEL_XPOS (VIDEO_DISPLAY2_XPOS) -#define VIDEO_REC_LABEL_YPOS (VIDEO_DISPLAY2_YPOS) -#define VIDEO_REC_LABEL_XSIZE 20 -#define VIDEO_REC_LABEL_YSIZE 12 -#define VIDEO_REC_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 20) -#define VIDEO_REC_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS) -#define VIDEO_REC_SYMBOL_XSIZE 16 -#define VIDEO_REC_SYMBOL_YSIZE 16 -#define VIDEO_PLAY_LABEL_XPOS (VIDEO_DISPLAY2_XPOS + 65) -#define VIDEO_PLAY_LABEL_YPOS (VIDEO_DISPLAY2_YPOS) -#define VIDEO_PLAY_LABEL_XSIZE 22 -#define VIDEO_PLAY_LABEL_YSIZE 12 -#define VIDEO_PLAY_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 52) -#define VIDEO_PLAY_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS) -#define VIDEO_PLAY_SYMBOL_XSIZE 11 -#define VIDEO_PLAY_SYMBOL_YSIZE 13 -#define VIDEO_PAUSE_LABEL_XPOS (VIDEO_DISPLAY2_XPOS) -#define VIDEO_PAUSE_LABEL_YPOS (VIDEO_DISPLAY2_YPOS + 20) -#define VIDEO_PAUSE_LABEL_XSIZE 35 -#define VIDEO_PAUSE_LABEL_YSIZE 8 -#define VIDEO_PAUSE_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 35) -#define VIDEO_PAUSE_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS) -#define VIDEO_PAUSE_SYMBOL_XSIZE 17 -#define VIDEO_PAUSE_SYMBOL_YSIZE 13 -#define VIDEO_TIME_XPOS (VIDEO_DISPLAY2_XPOS + 39) -#define VIDEO_TIME_YPOS (VIDEO_DISPLAY2_YPOS + 14) -#define VIDEO_TIME_XSIZE 50 -#define VIDEO_TIME_YSIZE 16 - -/* some default values for tape labels and symbols */ -#define VIDEO_LABEL_XPOS 5 -#define VIDEO_LABEL_YPOS 42 -#define VIDEO_LABEL_XSIZE 40 -#define VIDEO_LABEL_YSIZE 28 -#define VIDEO_SYMBOL_XPOS 39 -#define VIDEO_SYMBOL_YPOS 42 -#define VIDEO_SYMBOL_XSIZE 56 -#define VIDEO_SYMBOL_YSIZE 13 - -/* values for certain tape labels and symbols */ -#define VIDEO_FFWD_LABEL_XPOS VIDEO_LABEL_XPOS -#define VIDEO_FFWD_LABEL_YPOS 193 -#define VIDEO_FFWD_LABEL_XSIZE VIDEO_LABEL_XSIZE -#define VIDEO_FFWD_LABEL_YSIZE VIDEO_LABEL_YSIZE -#define VIDEO_FFWD_SYMBOL_XPOS VIDEO_SYMBOL_XPOS -#define VIDEO_FFWD_SYMBOL_YPOS 193 -#define VIDEO_FFWD_SYMBOL_XSIZE 27 -#define VIDEO_FFWD_SYMBOL_YSIZE VIDEO_SYMBOL_YSIZE - -#define VIDEO_PBEND_LABEL_XPOS VIDEO_LABEL_XPOS -#define VIDEO_PBEND_LABEL_YPOS 221 -#define VIDEO_PBEND_LABEL_XSIZE VIDEO_LABEL_XSIZE -#define VIDEO_PBEND_LABEL_YSIZE VIDEO_LABEL_YSIZE -#define VIDEO_PBEND_SYMBOL_XPOS VIDEO_SYMBOL_XPOS -#define VIDEO_PBEND_SYMBOL_YPOS 221 -#define VIDEO_PBEND_SYMBOL_XSIZE 27 -#define VIDEO_PBEND_SYMBOL_YSIZE VIDEO_SYMBOL_YSIZE - -#define VIDEO_WARP_LABEL_XPOS VIDEO_LABEL_XPOS -#define VIDEO_WARP_LABEL_YPOS 165 -#define VIDEO_WARP_LABEL_XSIZE VIDEO_LABEL_XSIZE -#define VIDEO_WARP_LABEL_YSIZE VIDEO_LABEL_YSIZE -#define VIDEO_WARP_SYMBOL_XPOS VIDEO_SYMBOL_XPOS -#define VIDEO_WARP_SYMBOL_YPOS 165 -#define VIDEO_WARP_SYMBOL_XSIZE 27 -#define VIDEO_WARP_SYMBOL_YSIZE VIDEO_SYMBOL_YSIZE -#define VIDEO_WARP2_SYMBOL_XPOS VIDEO_SYMBOL_XPOS -#define VIDEO_WARP2_SYMBOL_YPOS 152 -#define VIDEO_WARP2_SYMBOL_XSIZE 27 -#define VIDEO_WARP2_SYMBOL_YSIZE VIDEO_SYMBOL_YSIZE - -#define VIDEO_1STEP_SYMBOL_XPOS (VIDEO_SYMBOL_XPOS + 18) -#define VIDEO_1STEP_SYMBOL_YPOS 139 -#define VIDEO_1STEP_SYMBOL_XSIZE (VIDEO_SYMBOL_XSIZE - 18) -#define VIDEO_1STEP_SYMBOL_YSIZE VIDEO_SYMBOL_YSIZE - -#define PG_X3(x) (DOOR_GFX_PAGEX3 + (x)) -#define PG_X4(x) (DOOR_GFX_PAGEX4 + (x)) -#define PG_X5(x) (DOOR_GFX_PAGEX5 + (x)) -#define PG_X6(x) (DOOR_GFX_PAGEX6 + (x)) - -#define PG_Y1(y) (DOOR_GFX_PAGEY1 + (y)) -#define PG_Y2(y) (DOOR_GFX_PAGEY2 + (y)) - #define VIDEO_INFO_OFF (VIDEO_STATE_DATE_OFF | \ VIDEO_STATE_TIME_OFF | \ VIDEO_STATE_FRAME_OFF) @@ -145,6 +52,8 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS]; VIDEO_STATE_REC_OFF | \ VIDEO_STATE_PAUSE_OFF | \ VIDEO_STATE_FFWD_OFF | \ + VIDEO_STATE_WARP_OFF | \ + VIDEO_STATE_WARP2_OFF | \ VIDEO_STATE_PBEND_OFF | \ VIDEO_STATE_1STEP_OFF) #define VIDEO_PRESS_OFF (VIDEO_PRESS_PLAY_OFF | \ @@ -163,6 +72,8 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS]; VIDEO_STATE_REC_ON | \ VIDEO_STATE_PAUSE_ON | \ VIDEO_STATE_FFWD_ON | \ + VIDEO_STATE_WARP_ON | \ + VIDEO_STATE_WARP2_ON | \ VIDEO_STATE_PBEND_ON | \ VIDEO_STATE_1STEP_ON) #define VIDEO_PRESS_ON (VIDEO_PRESS_PLAY_ON | \ @@ -200,23 +111,23 @@ static void DrawVideoDisplay_Graphics(unsigned int state, unsigned int value) video_pos[NUM_TAPE_FUNCTIONS][NUM_TAPE_FUNCTION_PARTS] = { { - { IMG_TAPE_LABEL_GFX_PLAY, &tape.label.play }, - { IMG_TAPE_SYMBOL_GFX_PLAY, &tape.symbol.play }, + { IMG_GFX_TAPE_LABEL_PLAY, &tape.label.play }, + { IMG_GFX_TAPE_SYMBOL_PLAY, &tape.symbol.play }, }, { - { IMG_TAPE_LABEL_GFX_RECORD, &tape.label.record }, - { IMG_TAPE_SYMBOL_GFX_RECORD, &tape.symbol.record }, + { IMG_GFX_TAPE_LABEL_RECORD, &tape.label.record }, + { IMG_GFX_TAPE_SYMBOL_RECORD, &tape.symbol.record }, }, { - { IMG_TAPE_LABEL_GFX_PAUSE, &tape.label.pause }, - { IMG_TAPE_SYMBOL_GFX_PAUSE, &tape.symbol.pause }, + { IMG_GFX_TAPE_LABEL_PAUSE, &tape.label.pause }, + { IMG_GFX_TAPE_SYMBOL_PAUSE, &tape.symbol.pause }, }, { - { IMG_TAPE_LABEL_GFX_DATE, &tape.label.date }, + { IMG_GFX_TAPE_LABEL_DATE, &tape.label.date }, { -1, NULL }, }, { - { IMG_TAPE_LABEL_GFX_TIME, &tape.label.time }, + { IMG_GFX_TAPE_LABEL_TIME, &tape.label.time }, { -1, NULL }, }, { @@ -225,24 +136,24 @@ static void DrawVideoDisplay_Graphics(unsigned int state, unsigned int value) { -1, NULL }, }, { - { IMG_TAPE_LABEL_GFX_FAST_FORWARD, &tape.label.fast_forward }, - { IMG_TAPE_SYMBOL_GFX_FAST_FORWARD, &tape.symbol.fast_forward }, + { IMG_GFX_TAPE_LABEL_FAST_FORWARD, &tape.label.fast_forward }, + { IMG_GFX_TAPE_SYMBOL_FAST_FORWARD, &tape.symbol.fast_forward }, }, { - { IMG_TAPE_LABEL_GFX_PAUSE_BEFORE_END, &tape.label.pause_before_end }, - { IMG_TAPE_SYMBOL_GFX_PAUSE_BEFORE_END, &tape.symbol.pause_before_end }, + { IMG_GFX_TAPE_LABEL_WARP_FORWARD, &tape.label.warp_forward }, + { IMG_GFX_TAPE_SYMBOL_WARP_FORWARD, &tape.symbol.warp_forward }, }, { - { IMG_TAPE_LABEL_GFX_WARP_FORWARD_BLIND, &tape.label.warp_forward_blind}, - { IMG_TAPE_SYMBOL_GFX_WARP_FORWARD_BLIND, &tape.symbol.warp_forward_blind}, + { IMG_GFX_TAPE_LABEL_WARP_FORWARD_BLIND, &tape.label.warp_forward_blind}, + { IMG_GFX_TAPE_SYMBOL_WARP_FORWARD_BLIND, &tape.symbol.warp_forward_blind}, }, { - { IMG_TAPE_LABEL_GFX_WARP_FORWARD, &tape.label.warp_forward }, - { IMG_TAPE_SYMBOL_GFX_WARP_FORWARD, &tape.symbol.warp_forward }, + { IMG_GFX_TAPE_LABEL_PAUSE_BEFORE_END, &tape.label.pause_before_end }, + { IMG_GFX_TAPE_SYMBOL_PAUSE_BEFORE_END, &tape.symbol.pause_before_end }, }, { - { IMG_TAPE_LABEL_GFX_SINGLE_STEP, &tape.label.single_step }, - { IMG_TAPE_SYMBOL_GFX_SINGLE_STEP, &tape.symbol.single_step }, + { IMG_GFX_TAPE_LABEL_SINGLE_STEP, &tape.label.single_step }, + { IMG_GFX_TAPE_SYMBOL_SINGLE_STEP, &tape.symbol.single_step }, }, }; @@ -289,6 +200,8 @@ static void DrawVideoDisplay_Graphics(unsigned int state, unsigned int value) if (gd_bitmap != NULL) BlitBitmap(gd_bitmap, drawto, gd_x, gd_y, gfx->width, gfx->height, VX + pos->x, VY + pos->y); + + redraw_mask |= REDRAW_DOOR_2; } } } @@ -431,8 +344,55 @@ void DrawVideoDisplay(unsigned int state, unsigned int value) { DrawVideoDisplay_Graphics(state, value); DrawVideoDisplay_DateTime(state, value); +} - redraw_mask |= REDRAW_DOOR_2; +void DrawVideoDisplayLabel(unsigned int state) +{ + DrawVideoDisplay(state, VIDEO_DISPLAY_LABEL_ONLY); +} + +void DrawVideoDisplaySymbol(unsigned int state) +{ + DrawVideoDisplay(state, VIDEO_DISPLAY_SYMBOL_ONLY); +} + +void DrawVideoDisplayCurrentState() +{ + int state = 0; + + DrawVideoDisplay(VIDEO_STATE_OFF, 0); + + 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 if (tape.playing) + { + state |= VIDEO_STATE_PLAY_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 + DrawVideoDisplayLabel(state); + DrawVideoDisplaySymbol(state); } void DrawCompleteVideoDisplay() @@ -444,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); @@ -493,12 +452,50 @@ void TapeDeactivateDisplayOff(boolean redraw_display) if (redraw_display) { - RedrawPlayfield(TRUE, 0,0,0,0); + RedrawPlayfield(); DrawGameDoorValues(); } } +/* ========================================================================= */ +/* 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 */ /* ========================================================================= */ @@ -550,7 +547,7 @@ static void TapeRewind() { tape.counter = 0; tape.delay_played = 0; - tape.pause_before_death = FALSE; + tape.pause_before_end = FALSE; tape.recording = FALSE; tape.playing = FALSE; tape.fast_forward = FALSE; @@ -615,11 +612,21 @@ static void TapeAppendRecording() if (!tape.playing || !tape.pausing) return; - tape.pos[tape.counter].delay = tape.delay_played; + // stop playing tape.playing = FALSE; + tape.fast_forward = FALSE; + tape.warp_forward = FALSE; + tape.pause_before_end = FALSE; + tape.deactivate_display = FALSE; + + // start recording tape.recording = TRUE; tape.changed = TRUE; + // set current delay (for last played move) + tape.pos[tape.counter].delay = tape.delay_played; + + // set current date TapeSetDateFromNow(); DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); @@ -705,49 +712,59 @@ void TapeRecordAction(byte action_raw[MAX_PLAYERS]) } } -void TapeTogglePause(boolean toggle_manual) +void TapeTogglePause(boolean toggle_mode) { - int state = 0; + if (tape.playing && tape.pausing && (toggle_mode & TAPE_TOGGLE_PLAY_PAUSE)) + { + // continue playing in normal mode + tape.fast_forward = FALSE; + tape.warp_forward = FALSE; + tape.deactivate_display = FALSE; - if (tape.pause_before_death) - state |= VIDEO_STATE_PBEND_OFF; - else if (tape.fast_forward) - state |= VIDEO_STATE_FFWD_OFF; + tape.pause_before_end = FALSE; + } tape.pausing = !tape.pausing; - tape.fast_forward = FALSE; - tape.pause_before_death = FALSE; - if (tape.single_step && toggle_manual) + if (tape.single_step && (toggle_mode & TAPE_TOGGLE_MANUAL)) tape.single_step = FALSE; - state |= (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF); - if (tape.playing) - state |= VIDEO_STATE_PLAY_ON; - else - state |= (tape.single_step ? VIDEO_STATE_1STEP_ON : VIDEO_STATE_1STEP_OFF); + DrawVideoDisplayCurrentState(); - DrawVideoDisplay(state, 0); + if (tape.deactivate_display) + { + if (tape.pausing) + TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING); + else + TapeDeactivateDisplayOn(); + } - if (tape.warp_forward) + if (tape.quick_resume) { + tape.quick_resume = FALSE; + TapeStopWarpForward(); + TapeAppendRecording(); - if (tape.quick_resume) - { - tape.quick_resume = FALSE; + if (!CheckEngineSnapshotSingle()) + SaveEngineSnapshotSingle(); - TapeAppendRecording(); + // restart step/move snapshots after quick loading tape + SaveEngineSnapshotToListInitial(); - if (!CheckEngineSnapshot()) - SaveEngineSnapshotSingle(); - } + // do not map undo/redo buttons after quick loading tape + return; } - if (tape.pausing) - MapUndoRedoButtons(); - else if (!tape.single_step) - MapStopPlayButtons(); + if (setup.show_snapshot_buttons && + game_status == GAME_MODE_PLAYING && + CheckEngineSnapshotList()) + { + if (tape.pausing) + MapUndoRedoButtons(); + else if (!tape.single_step) + UnmapUndoRedoButtons(); + } } void TapeStartPlaying() @@ -794,74 +811,56 @@ void TapeStopPlaying() byte *TapePlayAction() { + int update_delay = FRAMES_PER_SECOND / 2; + boolean update_video_display = (FrameCounter % update_delay == 0); + boolean update_draw_label_on = ((FrameCounter / update_delay) % 2 == 1); static byte action[MAX_PLAYERS]; int i; if (!tape.playing || tape.pausing) return NULL; - if (tape.pause_before_death) /* stop 10 seconds before player gets killed */ + if (tape.pause_before_end) // stop some seconds before end of tape { - if (!(FrameCounter % 20)) - { - if ((FrameCounter / 20) % 2) - DrawVideoDisplay(VIDEO_STATE_PBEND_ON, VIDEO_DISPLAY_LABEL_ONLY); - else - DrawVideoDisplay(VIDEO_STATE_PBEND_OFF, VIDEO_DISPLAY_LABEL_ONLY); - } - - if (tape.warp_forward) - { - if (tape.deactivate_display) - DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY); - else - DrawVideoDisplay(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY); - } - if (TapeTime > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH) { + TapeStopWarpForward(); TapeTogglePause(TAPE_TOGGLE_MANUAL); return NULL; } } - else if (tape.fast_forward) + + if (tape.counter >= tape.length) /* end of tape reached */ { - if ((FrameCounter / 20) % 2) - DrawVideoDisplay(VIDEO_STATE_FFWD_ON, VIDEO_DISPLAY_LABEL_ONLY); + if (tape.warp_forward && !tape.auto_play) + { + TapeStopWarpForward(); + TapeTogglePause(TAPE_TOGGLE_MANUAL); + } else - DrawVideoDisplay(VIDEO_STATE_FFWD_OFF, VIDEO_DISPLAY_LABEL_ONLY); - - if (tape.warp_forward) { - if (tape.deactivate_display) - DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY); - else - DrawVideoDisplay(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY); + TapeStop(); } + + return NULL; } -#if 0 - /* !!! this makes things much slower !!! */ - else if (tape.warp_forward) + if (update_video_display && !tape.deactivate_display) { - if ((FrameCounter / 20) % 2) - DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_LABEL_ONLY); - else - DrawVideoDisplay(VIDEO_STATE_WARP_OFF, VIDEO_DISPLAY_LABEL_ONLY); + int state = 0; - DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY); - } -#endif + if (tape.warp_forward) + state |= VIDEO_STATE_WARP(update_draw_label_on); + else if (tape.fast_forward) + state |= VIDEO_STATE_FFWD(update_draw_label_on); - if (tape.counter >= tape.length) /* end of tape reached */ - { - if (tape.warp_forward && !tape.auto_play) - TapeTogglePause(TAPE_TOGGLE_MANUAL); - else - TapeStop(); + if (tape.pause_before_end) + state |= VIDEO_STATE_PBEND(update_draw_label_on); - return NULL; + // draw labels and symbols separately to prevent labels overlapping symbols + DrawVideoDisplayLabel(state); + DrawVideoDisplaySymbol(state); } for (i = 0; i < MAX_PLAYERS; i++) @@ -896,6 +895,9 @@ byte *TapePlayAction() tape.delay_played = 0; } + if (tape.auto_play) + PrintTapeReplayProgress(FALSE); + return action; } @@ -933,41 +935,31 @@ unsigned int GetTapeLengthSeconds() return (GetTapeLengthFrames() * GAME_FRAME_DELAY / 1000); } -static void TapeStartWarpForward() +static void TapeStartWarpForward(int mode) { - tape.warp_forward = TRUE; + tape.fast_forward = (mode & AUTOPLAY_FFWD); + tape.warp_forward = (mode & AUTOPLAY_WARP); + tape.deactivate_display = (mode & AUTOPLAY_WARP_NO_DISPLAY); - if (!tape.fast_forward && !tape.pause_before_death) - { - tape.pausing = FALSE; - tape.deactivate_display = TRUE; + tape.pausing = FALSE; + if (tape.deactivate_display) TapeDeactivateDisplayOn(); - } - if (tape.fast_forward || tape.pause_before_death) - DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY); - else - DrawVideoDisplay(VIDEO_STATE_WARP_ON, 0); + DrawVideoDisplayCurrentState(); } static void TapeStopWarpForward() { - int state = (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF); - + tape.fast_forward = FALSE; tape.warp_forward = FALSE; tape.deactivate_display = FALSE; - TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING); + tape.pause_before_end = FALSE; - if (tape.pause_before_death) - state |= VIDEO_STATE_WARP_OFF | VIDEO_STATE_PBEND_ON; - else if (tape.fast_forward) - state |= VIDEO_STATE_WARP_OFF | VIDEO_STATE_FFWD_ON; - else - state |= VIDEO_STATE_WARP_OFF | VIDEO_STATE_PLAY_ON; + TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING); - DrawVideoDisplay(state, 0); + DrawVideoDisplayCurrentState(); } static void TapeSingleStep() @@ -980,8 +972,7 @@ static void TapeSingleStep() tape.single_step = !tape.single_step; - DrawVideoDisplay((tape.single_step ? VIDEO_STATE_1STEP_ON : - VIDEO_STATE_1STEP_OFF), 0); + DrawVideoDisplay(VIDEO_STATE_1STEP(tape.single_step), 0); } void TapeQuickSave() @@ -1032,7 +1023,7 @@ void TapeQuickLoad() if (game_status != GAME_MODE_PLAYING && game_status != GAME_MODE_MAIN) return; - if (CheckEngineSnapshot()) + if (CheckEngineSnapshotSingle()) { TapeStartGamePlaying(); @@ -1046,6 +1037,9 @@ void TapeQuickLoad() TapeStopWarpForward(); TapeAppendRecording(); + // restart step/move snapshots after quick loading tape + SaveEngineSnapshotToListInitial(); + if (FrameCounter > 0) return; } @@ -1058,7 +1052,7 @@ void TapeQuickLoad() if (!TAPE_IS_EMPTY(tape)) { TapeStartGamePlaying(); - TapeStartWarpForward(); + TapeStartWarpForward(AUTOPLAY_MODE_WARP_NO_DISPLAY); tape.quick_resume = TRUE; } @@ -1102,7 +1096,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++; @@ -1114,7 +1108,9 @@ void AutoPlayTape() else { DrawCompleteVideoDisplay(); + audio.sound_enabled = FALSE; + setup.engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_OFF); autoplay_leveldir = getTreeInfoFromIdentifier(leveldir_first, global.autoplay_leveldir); @@ -1132,15 +1128,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; @@ -1157,61 +1153,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(); - 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); } @@ -1228,28 +1227,28 @@ static struct } tapebutton_info[NUM_TAPE_BUTTONS] = { { - IMG_TAPE_BUTTON_GFX_EJECT, &tape.button.eject, + IMG_GFX_TAPE_BUTTON_EJECT, &tape.button.eject, TAPE_CTRL_ID_EJECT, "eject tape" }, { /* (same position as "eject" button) */ - IMG_TAPE_BUTTON_GFX_EXTRA, &tape.button.eject, + IMG_GFX_TAPE_BUTTON_EXTRA, &tape.button.eject, TAPE_CTRL_ID_EXTRA, "extra functions" }, { - IMG_TAPE_BUTTON_GFX_STOP, &tape.button.stop, + IMG_GFX_TAPE_BUTTON_STOP, &tape.button.stop, TAPE_CTRL_ID_STOP, "stop tape" }, { - IMG_TAPE_BUTTON_GFX_PAUSE, &tape.button.pause, + IMG_GFX_TAPE_BUTTON_PAUSE, &tape.button.pause, TAPE_CTRL_ID_PAUSE, "pause tape" }, { - IMG_TAPE_BUTTON_GFX_RECORD, &tape.button.record, + IMG_GFX_TAPE_BUTTON_RECORD, &tape.button.record, TAPE_CTRL_ID_RECORD, "record tape" }, { - IMG_TAPE_BUTTON_GFX_PLAY, &tape.button.play, + IMG_GFX_TAPE_BUTTON_PLAY, &tape.button.play, TAPE_CTRL_ID_PLAY, "play tape" } }; @@ -1337,6 +1336,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) @@ -1368,31 +1395,32 @@ static void HandleTapeButtonsExt(int id) case TAPE_CTRL_ID_EXTRA: if (tape.playing) { - if (!tape.warp_forward) /* PLAY -> WARP FORWARD PLAY */ - { - TapeStartWarpForward(); - } - else /* WARP FORWARD PLAY -> PLAY */ - { - TapeStopWarpForward(); - } + tape.pause_before_end = !tape.pause_before_end; + + DrawVideoDisplayCurrentState(); } else if (tape.recording) + { TapeSingleStep(); + } break; case TAPE_CTRL_ID_STOP: TapeStop(); + break; case TAPE_CTRL_ID_PAUSE: TapeTogglePause(TAPE_TOGGLE_MANUAL); + break; case TAPE_CTRL_ID_RECORD: if (TAPE_IS_STOPPED(tape)) + { TapeStartGameRecording(); + } else if (tape.pausing) { if (tape.playing) /* PLAY -> PAUSE -> RECORD */ @@ -1400,9 +1428,17 @@ static void HandleTapeButtonsExt(int id) else TapeTogglePause(TAPE_TOGGLE_MANUAL); } + break; case TAPE_CTRL_ID_PLAY: + if (tape.recording && tape.pausing) /* PAUSE -> RECORD */ + { + // ("TAPE_IS_EMPTY(tape)" is TRUE here -- probably fix this) + + TapeTogglePause(TAPE_TOGGLE_MANUAL); + } + if (TAPE_IS_EMPTY(tape)) break; @@ -1414,29 +1450,34 @@ static void HandleTapeButtonsExt(int id) { if (tape.pausing) /* PAUSE -> PLAY */ { - TapeTogglePause(TAPE_TOGGLE_MANUAL); + TapeTogglePause(TAPE_TOGGLE_MANUAL | TAPE_TOGGLE_PLAY_PAUSE); } - else if (!tape.fast_forward) /* PLAY -> FAST FORWARD PLAY */ + else if (!tape.fast_forward) /* PLAY -> FFWD */ { tape.fast_forward = TRUE; - DrawVideoDisplay(VIDEO_STATE_FFWD_ON, 0); } - else if (!tape.pause_before_death) /* FFWD PLAY -> AUTO PAUSE */ + else if (!tape.warp_forward) /* FFWD -> WARP */ { - tape.pause_before_death = TRUE; - DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_ON, 0); + tape.warp_forward = TRUE; } - else /* AUTO PAUSE -> NORMAL PLAY */ + else if (!tape.deactivate_display) /* WARP -> WARP BLIND */ { - if (tape.warp_forward) - TapeStopWarpForward(); + tape.deactivate_display = TRUE; + TapeDeactivateDisplayOn(); + } + else /* WARP BLIND -> PLAY */ + { tape.fast_forward = FALSE; - tape.pause_before_death = FALSE; + tape.warp_forward = FALSE; + tape.deactivate_display = FALSE; - DrawVideoDisplay(VIDEO_STATE_PBEND_OFF | VIDEO_STATE_PLAY_ON, 0); + TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING); } + + DrawVideoDisplayCurrentState(); } + break; default: