From f1bf1f683c459ac4de4de05f938587d196084dea Mon Sep 17 00:00:00 2001 From: AllyTally Date: Wed, 10 Jan 2024 11:51:20 -0400 Subject: [PATCH] Fix text images not fading While a7b22919ae379c96001c8dcdb9f73c36d298f967 makes text sprites modulate their RGB values, text images continued using alpha, despite alpha blending not even being enabled, so the initial commit didn't work right either. --- desktop_version/src/Graphics.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp index d79d1f2d15..40947f857a 100644 --- a/desktop_version/src/Graphics.cpp +++ b/desktop_version/src/Graphics.cpp @@ -973,6 +973,7 @@ void Graphics::drawgui(void) opacity = tl_lerp; } + const int alpha = opacity * 255; if (textboxes[i].image == TEXTIMAGE_LEVELCOMPLETE) { // Level complete @@ -996,7 +997,6 @@ void Graphics::drawgui(void) y = 240 - y - 8 * sc; } SDL_Color color = TEXT_COLOUR("cyan"); - const int alpha = opacity * 255; font::print( (sc == 2 ? PR_2X : PR_1X) | PR_CEN | PR_BRIGHTNESS(alpha), -1, y, translation, color.r, color.g, color.b @@ -1004,7 +1004,7 @@ void Graphics::drawgui(void) } else { - const SDL_Color color = {255, 255, 255, (Uint8) (opacity * 255)}; + const SDL_Color color = {alpha, alpha, alpha}; if (flipmode) { drawimagecol(IMAGE_FLIPLEVELCOMPLETE, 0, 180, color, true);