From 499ac142413f554e98edef10afe9de8915b5d105 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 19 Feb 2017 19:33:41 +0000 Subject: [PATCH] Pass canvas to hud_set_primary_weapon_fontcolor --- similar/main/gauges.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/similar/main/gauges.cpp b/similar/main/gauges.cpp index cd69afcf0..b5656f155 100644 --- a/similar/main/gauges.cpp +++ b/similar/main/gauges.cpp @@ -1130,10 +1130,10 @@ static rgb_t hud_get_primary_weapon_fontcolor(const player_info &player_info, co } } -static void hud_set_primary_weapon_fontcolor(const player_info &player_info, const int consider_weapon) +static void hud_set_primary_weapon_fontcolor(const player_info &player_info, const unsigned consider_weapon, grs_canvas &canvas) { auto rgb = hud_get_primary_weapon_fontcolor(player_info, consider_weapon); - gr_set_fontcolor(*grd_curcanv, gr_find_closest_color(rgb.r, rgb.g, rgb.b), -1); + gr_set_fontcolor(canvas, gr_find_closest_color(rgb.r, rgb.g, rgb.b), -1); } __attribute_warn_unused_result @@ -1234,7 +1234,7 @@ static void hud_show_primary_weapons_mode(const player_info &player_info, const const auto i = static_cast(ui); const char *txtweapon; char weapon_str[10]; - hud_set_primary_weapon_fontcolor(player_info, i); + hud_set_primary_weapon_fontcolor(player_info, i, *grd_curcanv); switch(i) { case primary_weapon_index_t::LASER_INDEX: @@ -1315,7 +1315,7 @@ static void hud_show_primary_weapons_mode(const player_info &player_info, const const auto i = static_cast(ui); const char *txtweapon; char weapon_str[10]; - hud_set_primary_weapon_fontcolor(player_info, i); + hud_set_primary_weapon_fontcolor(player_info, i, *grd_curcanv); switch(i) { case primary_weapon_index_t::SUPER_LASER_INDEX: