mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of some if conditionals

Browse Source
This commit is contained in:
twinaphex 2017-04-29 19:21:24 +02:00
parent 254fa75a0f
commit 17827940fd
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gfx/drivers_font/gl_raster_font.c
View File

@ -355,10 +355,9 @@ static void gl_raster_font_render_message(
/* If the font height is not supported just draw as usual */ /* If the font height is not supported just draw as usual */
if (!font->font_driver->get_line_height) if (!font->font_driver->get_line_height)
{ {
if (font->gl) gl_raster_font_render_line(font,
gl_raster_font_render_line(font, msg, (unsigned)strlen(msg), scale, color, pos_x,
msg, (unsigned)strlen(msg), scale, color, pos_x, pos_y, text_align);
pos_y, text_align);
return; return;
} }
@ -372,10 +371,9 @@ static void gl_raster_font_render_message(
? (unsigned)(delim - msg) : (unsigned)strlen(msg); ? (unsigned)(delim - msg) : (unsigned)strlen(msg);
/* Draw the line */ /* Draw the line */
if (font->gl) gl_raster_font_render_line(font,
gl_raster_font_render_line(font, msg, msg_len, scale, color, pos_x,
msg, msg_len, scale, color, pos_x, pos_y - (float)lines*line_height, text_align);
pos_y - (float)lines*line_height, text_align);
if (!delim) if (!delim)
break; break;
@ -489,12 +487,14 @@ static void gl_raster_font_render_msg(
color_dark[2] = color[2] * drop_mod; color_dark[2] = color[2] * drop_mod;
color_dark[3] = color[3] * drop_alpha; color_dark[3] = color[3] * drop_alpha;
gl_raster_font_render_message(font, msg, scale, color_dark, if (font->gl)
x + scale * drop_x / font->gl->vp.width, y + gl_raster_font_render_message(font, msg, scale, color_dark,
scale * drop_y / font->gl->vp.height, text_align); x + scale * drop_x / font->gl->vp.width, y +
scale * drop_y / font->gl->vp.height, text_align);
} }
gl_raster_font_render_message(font, msg, scale, color, x, y, text_align); if (font->gl)
gl_raster_font_render_message(font, msg, scale, color, x, y, text_align);
} }
if (!font->block) if (!font->block)