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);
+ 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();
DrawVideoDisplaySymbol(VIDEO_STATE_WARP_ON);
}
+ else
+ {
+ DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
+ }
if (tape.quick_resume)
{
tape.fast_forward = FALSE;
tape.pause_before_death = FALSE;
- DrawVideoDisplay(VIDEO_STATE_PBEND_OFF, 0);
-
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
if (update_video_display && !tape.deactivate_display)
{
if (tape.pause_before_death)
- DrawVideoDisplayLabel(update_draw_label_on ?
- VIDEO_STATE_PBEND_ON :
- VIDEO_STATE_PBEND_OFF);
+ DrawVideoDisplayLabel(VIDEO_STATE_PBEND(update_draw_label_on));
else if (tape.fast_forward)
- DrawVideoDisplayLabel(update_draw_label_on ?
- VIDEO_STATE_FFWD_ON :
- VIDEO_STATE_FFWD_OFF);
+ DrawVideoDisplayLabel(VIDEO_STATE_FFWD(update_draw_label_on));
if (tape.warp_forward)
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;
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_death ? 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()