X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=a3f8e9c5683bb44c93d8f4b54d9a4f1482ddfdc2;hb=0e661055e1233e585fb259832e4884f68d3833a4;hp=efc8bcb4c26eca3fdf8189470d00319dbdb0dc02;hpb=0e5aef968a447e03002cbcc120df7555df624b85;p=rocksndiamonds.git diff --git a/src/tape.c b/src/tape.c index efc8bcb4..a3f8e9c5 100644 --- a/src/tape.c +++ b/src/tape.c @@ -289,6 +289,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 +433,6 @@ void DrawVideoDisplay(unsigned int state, unsigned int value) { DrawVideoDisplay_Graphics(state, value); DrawVideoDisplay_DateTime(state, value); - - redraw_mask |= REDRAW_DOOR_2; } void DrawCompleteVideoDisplay() @@ -493,7 +493,7 @@ void TapeDeactivateDisplayOff(boolean redraw_display) if (redraw_display) { - RedrawPlayfield(TRUE, 0,0,0,0); + RedrawPlayfield(); DrawGameDoorValues(); } } @@ -747,7 +747,9 @@ void TapeTogglePause(boolean toggle_manual) } } - if (CheckEngineSnapshotList()) + if (setup.show_snapshot_buttons && + game_status == GAME_MODE_PLAYING && + CheckEngineSnapshotList()) { if (tape.pausing) MapUndoRedoButtons(); @@ -1195,7 +1197,12 @@ void AutoPlayTape() printf("playing tape ... "); TapeStartGamePlaying(); - TapeStartWarpForward(); + + if (global.autoplay_mode == AUTOPLAY_FFWD) + tape.fast_forward = TRUE; + + if (global.autoplay_mode != AUTOPLAY_PLAY) + TapeStartWarpForward(); return; } @@ -1412,6 +1419,13 @@ static void HandleTapeButtonsExt(int id) 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;