From a305a48a11a32c1bc19969c557e510ed6d6bd657 Mon Sep 17 00:00:00 2001 From: jdgleaver Date: Mon, 4 May 2020 16:56:41 +0100 Subject: [PATCH] (3DS) Fix font driver --- gfx/drivers_font/ctr_font.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gfx/drivers_font/ctr_font.c b/gfx/drivers_font/ctr_font.c index 3acc3e97b1..1726208675 100644 --- a/gfx/drivers_font/ctr_font.c +++ b/gfx/drivers_font/ctr_font.c @@ -243,7 +243,7 @@ static void ctr_font_render_line( GPU_TEVSOURCES(GPU_TEXTURE0, GPU_CONSTANT, 0), GPU_TEVSOURCES(GPU_TEXTURE0, GPU_CONSTANT, 0), 0, - GPU_TEVOPERANDS(GPU_TEVOP_RGB_SRC_R, GPU_TEVOP_RGB_SRC_ALPHA, 0), + GPU_TEVOPERANDS(GPU_TEVOP_RGB_SRC_ALPHA, 0, 0), GPU_MODULATE, GPU_MODULATE, color); @@ -329,7 +329,7 @@ static void ctr_font_render_message( return; } - line_height = scale / line_metrics->height; + line_height = (float)line_metrics->height * scale / (float)height; for (;;) { @@ -397,7 +397,7 @@ static void ctr_font_render_msg( b = FONT_COLOR_GET_BLUE(params->color); alpha = FONT_COLOR_GET_ALPHA(params->color); - color = params->color; + color = COLOR_ABGR(r, g, b, alpha); } else { @@ -412,10 +412,10 @@ static void ctr_font_render_msg( alpha = 255; color = COLOR_ABGR(r, g, b, alpha); - drop_x = -2; - drop_y = -2; - drop_mod = 0.3f; - drop_alpha = 1.0f; + drop_x = 1; + drop_y = -1; + drop_mod = 0.0f; + drop_alpha = 0.75f; } max_glyphs = strlen(msg);