TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Narrow grs_canvas fg/bg color fields

Browse source
This commit is contained in:
Kp 2021-09-04 12:17:14 +00:00
parent 35c7684200
commit fb3c2a4808
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/include/gr.h
View file

@ -174,8 +174,8 @@ struct grs_canvas : prohibit_void_ptr<grs_canvas>
}
grs_bitmap cv_bitmap; // the bitmap for this canvas
const grs_font * cv_font; // the currently selected font
short cv_font_fg_color; // current font foreground color (-1==Invisible)
short cv_font_bg_color; // current font background color (-1==Invisible)
color_palette_index cv_font_fg_color; // current font foreground color (255==Invisible)
color_palette_index cv_font_bg_color; // current font background color (255==Invisible)
unsigned cv_fade_level; // transparency level
protected:
grs_canvas() = default;

8
similar/2d/font.cpp
View file

@ -182,7 +182,7 @@ constexpr std::integral_constant<int, 1> gr_message_color_level{};
text_ptr++; \
if (*text_ptr){ \
if (gr_message_color_level >= control_code) \
canvas.cv_font_fg_color = static_cast<uint8_t>(*text_ptr); \
canvas.cv_font_fg_color = *text_ptr; \
text_ptr++; \
} \
} \
@ -193,7 +193,7 @@ constexpr std::integral_constant<int, 1> gr_message_color_level{};
} \
else if (control_code >= 0x04 && control_code <= 0x06) { \
if (gr_message_color_level >= control_code - 3) \
canvas.cv_font_fg_color= static_cast<uint8_t>(orig_color); \
canvas.cv_font_fg_color= orig_color; \
text_ptr++; \
}
@ -678,7 +678,7 @@ static void gr_ustring_mono(grs_canvas &canvas, const grs_font &cv_font, const i
switch (canvas.cv_bitmap.get_type())
{
case bm_mode::linear:
if (canvas.cv_font_bg_color == -1)
if (canvas.cv_font_bg_color == TRANSPARENCY_COLOR)
gr_internal_string0m(canvas, cv_font, x, y, s);
else
gr_internal_string0(canvas, cv_font, x, y, s);
@ -725,7 +725,7 @@ void gr_string(grs_canvas &canvas, const grs_font &cv_font, const int x, const i
return;
}
if (canvas.cv_font_bg_color == -1)
if (canvas.cv_font_bg_color == TRANSPARENCY_COLOR)
{
gr_internal_string_clipped_m(canvas, cv_font, x, y, s);
return;