{ IMG_GFX_TAPE_SYMBOL_FAST_FORWARD, &tape.symbol.fast_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_GFX_TAPE_LABEL_WARP_FORWARD, &tape.label.warp_forward },
+ { IMG_GFX_TAPE_SYMBOL_WARP_FORWARD, &tape.symbol.warp_forward },
},
{
{ 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_GFX_TAPE_LABEL_WARP_FORWARD, &tape.label.warp_forward },
- { IMG_GFX_TAPE_SYMBOL_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_GFX_TAPE_LABEL_SINGLE_STEP, &tape.label.single_step },
DrawVideoDisplay_DateTime(state, value);
}
+void DrawVideoDisplayLabel(unsigned int state)
+{
+ DrawVideoDisplay(state, VIDEO_DISPLAY_LABEL_ONLY);
+}
+
+void DrawVideoDisplaySymbol(unsigned int state)
+{
+ DrawVideoDisplay(state, VIDEO_DISPLAY_SYMBOL_ONLY);
+}
+
void DrawCompleteVideoDisplay()
{
struct GraphicInfo *g_tape = &graphic_info[IMG_BACKGROUND_TAPE];
{
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;
tape.playing = FALSE;
tape.fast_forward = FALSE;
tape.warp_forward = FALSE;
- tape.pause_before_death = FALSE;
+ tape.pause_before_end = FALSE;
tape.deactivate_display = FALSE;
// start recording
if (tape.single_step && toggle_manual)
tape.single_step = FALSE;
- state |= (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF);
+ state |= VIDEO_STATE_PAUSE(tape.pausing);
- if (tape.pause_before_death)
- state |= (tape.pausing ? VIDEO_STATE_PBEND_OFF : VIDEO_STATE_PBEND_ON);
+ if (tape.pause_before_end)
+ state |= VIDEO_STATE_PBEND(!tape.pausing);
else if (tape.fast_forward)
- state |= (tape.pausing ? VIDEO_STATE_FFWD_OFF : VIDEO_STATE_FFWD_ON);
+ state |= VIDEO_STATE_FFWD(!tape.pausing);
if (tape.playing)
state |= VIDEO_STATE_PLAY_ON;
else
- state |= (tape.single_step ? VIDEO_STATE_1STEP_ON : VIDEO_STATE_1STEP_OFF);
+ state |= VIDEO_STATE_1STEP(tape.single_step);
DrawVideoDisplay(state, 0);
{
TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
}
- else
+ else if (tape.deactivate_display)
{
- if (tape.deactivate_display)
- TapeDeactivateDisplayOn();
+ TapeDeactivateDisplayOn();
- DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+ DrawVideoDisplaySymbol(VIDEO_STATE_WARP_ON);
+ }
+ else
+ {
+ DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
}
if (tape.quick_resume)
if (!tape.playing || tape.pausing)
return NULL;
- if (tape.pause_before_death) // stop some seconds before end of tape
+ if (tape.pause_before_end) // stop some seconds before end of tape
{
if (TapeTime > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
{
tape.fast_forward = FALSE;
- tape.pause_before_death = FALSE;
-
- DrawVideoDisplay(VIDEO_STATE_PBEND_OFF, 0);
+ tape.pause_before_end = FALSE;
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
if (update_video_display && !tape.deactivate_display)
{
- if (tape.pause_before_death)
- DrawVideoDisplay(update_draw_label_on ?
- VIDEO_STATE_PBEND_ON :
- VIDEO_STATE_PBEND_OFF, VIDEO_DISPLAY_LABEL_ONLY);
+ if (tape.pause_before_end)
+ DrawVideoDisplayLabel(VIDEO_STATE_PBEND(update_draw_label_on));
else if (tape.fast_forward)
- DrawVideoDisplay(update_draw_label_on ?
- VIDEO_STATE_FFWD_ON :
- VIDEO_STATE_FFWD_OFF, VIDEO_DISPLAY_LABEL_ONLY);
+ DrawVideoDisplayLabel(VIDEO_STATE_FFWD(update_draw_label_on));
if (tape.warp_forward)
- DrawVideoDisplay(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+ DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
}
if (tape.counter >= tape.length) /* end of tape reached */
{
tape.warp_forward = TRUE;
- if (!tape.fast_forward && !tape.pause_before_death)
+ if (!tape.fast_forward && !tape.pause_before_end)
{
tape.pausing = FALSE;
- tape.pause_before_death = TRUE;
+ tape.pause_before_end = TRUE;
tape.deactivate_display = TRUE;
TapeDeactivateDisplayOn();
DrawVideoDisplay(VIDEO_STATE_PBEND_ON, 0);
- DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+ DrawVideoDisplaySymbol(VIDEO_STATE_WARP_ON);
}
else
{
- DrawVideoDisplay(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+ DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
}
}
static void TapeStopWarpForward()
{
- int state = (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF);
+ int state = VIDEO_STATE_PAUSE(tape.pausing);
if (tape.deactivate_display)
- tape.pause_before_death = FALSE;
+ tape.pause_before_end = FALSE;
tape.warp_forward = FALSE;
tape.deactivate_display = FALSE;
TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
- 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;
+ state |= VIDEO_STATE_WARP_OFF;
+ state |= (tape.pause_before_end ? VIDEO_STATE_PBEND_ON :
+ tape.fast_forward ? VIDEO_STATE_FFWD_ON :
+ VIDEO_STATE_PLAY_ON);
DrawVideoDisplay(state, 0);
}
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()
// continue playing in normal mode
tape.fast_forward = FALSE;
tape.warp_forward = FALSE;
- tape.pause_before_death = FALSE;
+ tape.pause_before_end = FALSE;
tape.deactivate_display = FALSE;
TapeTogglePause(TAPE_TOGGLE_MANUAL);
DrawVideoDisplay(VIDEO_STATE_FFWD_ON, 0);
}
- else if (!tape.pause_before_death) /* FFWD PLAY -> AUTO PAUSE */
+ else if (!tape.pause_before_end) /* FFWD PLAY -> AUTO PAUSE */
{
- tape.pause_before_death = TRUE;
+ tape.pause_before_end = TRUE;
DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_ON, 0);
if (tape.warp_forward)
- DrawVideoDisplay(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+ DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
}
else /* AUTO PAUSE -> NORMAL PLAY */
{
TapeStopWarpForward();
tape.fast_forward = FALSE;
- tape.pause_before_death = FALSE;
+ tape.pause_before_end = FALSE;
DrawVideoDisplay(VIDEO_STATE_PBEND_OFF | VIDEO_STATE_PLAY_ON, 0);
}