From 7a790f6068e7244ad983c0771dfbb8c6ac683c2e Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 5 Jul 2020 23:34:32 +0000
Subject: [PATCH] Inline gr_set_fontcolor

It is a trivial function.
---
 common/include/fwd-gr.h |  1 -
 common/include/gr.h     | 18 ++++++++++++++++++
 similar/2d/font.cpp     |  6 ------
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/common/include/fwd-gr.h b/common/include/fwd-gr.h
index 9ce9295c6..31fa71619 100644
--- a/common/include/fwd-gr.h
+++ b/common/include/fwd-gr.h
@@ -282,7 +282,6 @@ namespace dcx {
 //remap (by re-reading) all the color fonts
 void gr_remap_color_fonts();
 void gr_set_curfont(grs_canvas &, const grs_font *);
-void gr_set_fontcolor(grs_canvas &, int fg_color, int bg_color);
 void gr_string(grs_canvas &, const grs_font &, int x, int y, const char *s, int w, int h);
 void gr_string(grs_canvas &, const grs_font &, int x, int y, const char *s);
 void gr_ustring(grs_canvas &, const grs_font &, int x, int y, const char *s);
diff --git a/common/include/gr.h b/common/include/gr.h
index a7d874cd5..44e94d258 100644
--- a/common/include/gr.h
+++ b/common/include/gr.h
@@ -299,6 +299,24 @@ static inline void gr_set_transparent(grs_bitmap &bm, bool bTransparent)
 }
 
 namespace dcx {
+
+static inline void gr_set_font_fg_color(grs_canvas &canvas, int fg_color)
+{
+	canvas.cv_font_fg_color = fg_color;
+}
+
+static inline void gr_set_font_bg_color(grs_canvas &canvas, int bg_color)
+{
+	canvas.cv_font_bg_color = bg_color;
+}
+
+#define gr_set_fontcolor(C,F,B)	\
+	( DXX_BEGIN_COMPOUND_STATEMENT {	\
+		auto &gr_set_fontcolor = C;	\
+		gr_set_font_fg_color(gr_set_fontcolor, F);	\
+		gr_set_font_bg_color(gr_set_fontcolor, B);	\
+		} DXX_END_COMPOUND_STATEMENT )
+
 struct font_delete
 {
 	void operator()(grs_font *p) const
diff --git a/similar/2d/font.cpp b/similar/2d/font.cpp
index e3d31516b..d1c7b595a 100644
--- a/similar/2d/font.cpp
+++ b/similar/2d/font.cpp
@@ -1077,12 +1077,6 @@ void gr_set_curfont(grs_canvas &canvas, const grs_font *n)
 	canvas.cv_font = n;
 }
 
-void gr_set_fontcolor(grs_canvas &canvas, const int fg_color, const int bg_color)
-{
-	canvas.cv_font_fg_color = fg_color;
-	canvas.cv_font_bg_color = bg_color;
-}
-
 template <bool masked_draws_background>
 static int gr_internal_string_clipped_template(grs_canvas &canvas, const grs_font &cv_font, int x, int y, const char *const s)
 {