projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3629adb
)
small cleanup for drawing tape recorder labels and symbols only
author
Holger Schemel
<info@artsoft.org>
Tue, 31 May 2016 09:41:05 +0000
(11:41 +0200)
committer
Holger Schemel
<info@artsoft.org>
Tue, 31 May 2016 09:41:05 +0000
(11:41 +0200)
src/tape.c
patch
|
blob
|
history
diff --git
a/src/tape.c
b/src/tape.c
index 128c38b0f7bd04c09ddb750465132697d55fd3c4..d2a0b7495e9155a6a8c288133334ee55900bc750 100644
(file)
--- a/
src/tape.c
+++ b/
src/tape.c
@@
-435,6
+435,16
@@
void DrawVideoDisplay(unsigned int state, unsigned int value)
DrawVideoDisplay_DateTime(state, value);
}
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];
void DrawCompleteVideoDisplay()
{
struct GraphicInfo *g_tape = &graphic_info[IMG_BACKGROUND_TAPE];
@@
-749,7
+759,7
@@
void TapeTogglePause(boolean toggle_manual)
if (tape.deactivate_display)
TapeDeactivateDisplayOn();
if (tape.deactivate_display)
TapeDeactivateDisplayOn();
- DrawVideoDisplay
(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY
);
+ DrawVideoDisplay
Symbol(VIDEO_STATE_WARP_ON
);
}
if (tape.quick_resume)
}
if (tape.quick_resume)
@@
-850,16
+860,16
@@
byte *TapePlayAction()
if (update_video_display && !tape.deactivate_display)
{
if (tape.pause_before_death)
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
);
+ DrawVideoDisplay
Label
(update_draw_label_on ?
+
VIDEO_STATE_PBEND_ON :
+
VIDEO_STATE_PBEND_OFF
);
else if (tape.fast_forward)
else if (tape.fast_forward)
- DrawVideoDisplay(update_draw_label_on ?
- VIDEO_STATE_FFWD_ON :
-
VIDEO_STATE_FFWD_OFF, VIDEO_DISPLAY_LABEL_ONLY
);
+ DrawVideoDisplay
Label
(update_draw_label_on ?
+
VIDEO_STATE_FFWD_ON :
+
VIDEO_STATE_FFWD_OFF
);
if (tape.warp_forward)
if (tape.warp_forward)
- DrawVideoDisplay
(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY
);
+ DrawVideoDisplay
Symbol(VIDEO_STATE_WARP2_ON
);
}
if (tape.counter >= tape.length) /* end of tape reached */
}
if (tape.counter >= tape.length) /* end of tape reached */
@@
-954,11
+964,11
@@
static void TapeStartWarpForward()
TapeDeactivateDisplayOn();
DrawVideoDisplay(VIDEO_STATE_PBEND_ON, 0);
TapeDeactivateDisplayOn();
DrawVideoDisplay(VIDEO_STATE_PBEND_ON, 0);
- DrawVideoDisplay
(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY
);
+ DrawVideoDisplay
Symbol(VIDEO_STATE_WARP_ON
);
}
else
{
}
else
{
- DrawVideoDisplay
(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY
);
+ DrawVideoDisplay
Symbol(VIDEO_STATE_WARP2_ON
);
}
}
}
}
@@
-1475,7
+1485,7
@@
static void HandleTapeButtonsExt(int id)
DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_ON, 0);
if (tape.warp_forward)
DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_ON, 0);
if (tape.warp_forward)
- DrawVideoDisplay
(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY
);
+ DrawVideoDisplay
Symbol(VIDEO_STATE_WARP2_ON
);
}
else /* AUTO PAUSE -> NORMAL PLAY */
{
}
else /* AUTO PAUSE -> NORMAL PLAY */
{