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];
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();
- DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+ DrawVideoDisplaySymbol(VIDEO_STATE_WARP_ON);
+ }
+ else
+ {
+ DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
}
if (tape.quick_resume)
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;
- // stop some seconds before player gets killed
- if (tape.pause_before_death)
+ if (tape.pause_before_death) // 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);
-
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
}
}
- if (!tape.deactivate_display)
+ if (update_video_display && !tape.deactivate_display)
{
if (tape.pause_before_death)
- {
- 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);
- }
- }
+ DrawVideoDisplayLabel(VIDEO_STATE_PBEND(update_draw_label_on));
else if (tape.fast_forward)
- {
- if ((FrameCounter / 20) % 2)
- DrawVideoDisplay(VIDEO_STATE_FFWD_ON, VIDEO_DISPLAY_LABEL_ONLY);
- 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);
- }
- }
- }
-
-#if 0
- /* !!! this makes things much slower !!! */
- else if (tape.warp_forward)
- {
- if ((FrameCounter / 20) % 2)
- DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_LABEL_ONLY);
- else
- DrawVideoDisplay(VIDEO_STATE_WARP_OFF, VIDEO_DISPLAY_LABEL_ONLY);
+ DrawVideoDisplayLabel(VIDEO_STATE_FFWD(update_draw_label_on));
- DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+ if (tape.warp_forward)
+ DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
}
-#endif
if (tape.counter >= tape.length) /* end of tape reached */
{
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;
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()
else if (!tape.fast_forward) /* PLAY -> FAST FORWARD PLAY */
{
tape.fast_forward = TRUE;
+
DrawVideoDisplay(VIDEO_STATE_FFWD_ON, 0);
}
else if (!tape.pause_before_death) /* FFWD PLAY -> AUTO PAUSE */
{
tape.pause_before_death = TRUE;
+
DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_ON, 0);
+
+ if (tape.warp_forward)
+ DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
}
else /* AUTO PAUSE -> NORMAL PLAY */
{