From a5a80a3aeba9c0c91d52ce1e3ec3860a55ccf4d3 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Tue, 7 Jun 2016 14:30:06 +0200 Subject: [PATCH] added missing recording modes to tape recorder display state function --- src/tape.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/tape.c b/src/tape.c index 963ca1e8..919bd418 100644 --- a/src/tape.c +++ b/src/tape.c @@ -356,20 +356,26 @@ 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) { + state |= VIDEO_STATE_PLAY_ON; + if (tape.deactivate_display) state |= VIDEO_STATE_WARP2_ON; else if (tape.warp_forward) @@ -673,7 +679,7 @@ void TapeTogglePause(boolean toggle_manual) if (tape.single_step && toggle_manual) tape.single_step = FALSE; - DrawVideoDisplayPlayState(); + DrawVideoDisplayCurrentState(); if (tape.deactivate_display) { @@ -883,7 +889,7 @@ static void TapeStartWarpForward() TapeDeactivateDisplayOn(); - DrawVideoDisplayPlayState(); + DrawVideoDisplayCurrentState(); } static void TapeStopWarpForward() @@ -896,7 +902,7 @@ static void TapeStopWarpForward() TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING); - DrawVideoDisplayPlayState(); + DrawVideoDisplayCurrentState(); } static void TapeSingleStep() @@ -1308,7 +1314,7 @@ static void HandleTapeButtonsExt(int id) { tape.pause_before_end = !tape.pause_before_end; - DrawVideoDisplayPlayState(); + DrawVideoDisplayCurrentState(); } else if (tape.recording) { @@ -1393,7 +1399,7 @@ static void HandleTapeButtonsExt(int id) TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING); } - DrawVideoDisplayPlayState(); + DrawVideoDisplayCurrentState(); } break; -- 2.34.1