From a320ee3b4d7c326c4711e3c428e4e6dcf993d0ff Mon Sep 17 00:00:00 2001
From: Dav999-v <dav999.tolp@gmail.com>
Date: Tue, 21 Feb 2023 03:05:45 +0100
Subject: [PATCH] Deduplicate font::print for activity zone prompts

There were two print calls, one for the transparent case, and one for
a regular textbox. The print calls were nearly the same except for the
color, and for some reason the transparent case didn't have PR_CJK_LOW
(that one is on me).
---
 desktop_version/src/Render.cpp | 37 +++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp
index 02cb9ea2..a50883de 100644
--- a/desktop_version/src/Render.cpp
+++ b/desktop_version/src/Render.cpp
@@ -2222,17 +2222,13 @@ void gamerender(void)
             game.activity_lastprompt.c_str()
         );
 
+        uint8_t text_r, text_g, text_b;
+
         if (game.activity_r == 0 && game.activity_g == 0 && game.activity_b == 0)
         {
-            font::print(
-                game.activity_print_flags | PR_BRIGHTNESS(act_alpha*255) | PR_CEN,
-                -1,
-                game.activity_y + 12,
-                final_string,
-                196,
-                196,
-                255 - help.glow
-            );
+            text_r = 196;
+            text_g = 196;
+            text_b = 255 - help.glow;
         }
         else
         {
@@ -2245,16 +2241,21 @@ void gamerender(void)
                 game.activity_g*act_alpha,
                 game.activity_b*act_alpha
             );
-            font::print(
-                game.activity_print_flags | PR_BRIGHTNESS(act_alpha*255) | PR_CJK_LOW | PR_CEN,
-                -1,
-                game.activity_y + 12,
-                final_string,
-                game.activity_r,
-                game.activity_g,
-                game.activity_b
-            );
+
+            text_r = game.activity_r;
+            text_g = game.activity_g;
+            text_b = game.activity_b;
         }
+
+        font::print(
+            game.activity_print_flags | PR_BRIGHTNESS(act_alpha*255) | PR_CJK_LOW | PR_CEN,
+            -1,
+            game.activity_y + 12,
+            final_string,
+            text_r,
+            text_g,
+            text_b
+        );
     }
 
     if (obj.trophytext > 0 || obj.oldtrophytext > 0)