Allow Custom Gauges to fully use parent type colors (#6799)

* Allow Custom Gauges to fully use parent type colors

#6670 allowed for custom coloring of HUD gauges, so this PR follows that up with fixing a few edge cases where mods with custom gauges that are linked to parent gauge types accurately reflect the color of their parent gauge type in both the new saved HUD file and the in-mission HUD.

This ability to link color to parent gauges for custom gauges the player cannot edit is what the behavior has always been, so this PR does not change any expected behavior it simply ensures that the new HUD updates and various combinations of table entries for `Config` are all robustly accounted for. For example, in FotG we have multiple non-configurable custom gauges all tied to the center reticle, so if the player changes the color of the center reticle all the custom gauges set to that type also automatically change color.

Tested and works as expected.

* appease clang

* one more clang

* clang needs to calm down

* instruct clang to be calm

* fix comment typo

Author: wookieejedi

code/hud/hudconfig.h

@@ -147,6 +147,11 @@ extern SCP_vector<SCP_string> observer_visible_gauges;
 extern const int HC_gauge_config_coords[GR_NUM_RESOLUTIONS][4];
 extern int HC_resize_mode;
 
+/*!
+ * @brief get the gauge pointer for the given gauge index
+ */
+HudGauge* hud_config_get_gauge_pointer(const SCP_string& gauge_id);
+
 /**
  * @brief Contains core HUD configuration data
  * @note Is not default init'd.  Assumes new player, PLR, or CSG reads will correctly set data.
@@ -176,17 +181,18 @@ typedef struct HUD_CONFIG_TYPE {
 		gauge_colors[gauge_id] = col;
 	}
 
-	// Get the gauge color, the color based on it's type, or white if the gauge is not found
-	color get_gauge_color(const SCP_string& gauge_id) const
+	// Get the gauge color, the color based on its type, or white if the gauge is not found
+	color get_gauge_color(const SCP_string& gauge_id, bool check_exact_match = true) const
 	{
 		auto it = gauge_colors.find(gauge_id);
 
 		// Got a match? Return it
-		if (it != gauge_colors.end()) {
+		// but only if we are using the exact match
+		if (check_exact_match && it != gauge_colors.end()) {
 			return it->second;
 		}
 
-		// No match.. try using the gauge type
+		// No match yet.. try using the gauge type
 		auto type_it = gauge_types.find(gauge_id);
 		if (type_it != gauge_types.end()) {
 			const HC_gauge_mappings& gauge_map = HC_gauge_mappings::get_instance();
@@ -228,6 +234,13 @@ typedef struct HUD_CONFIG_TYPE {
 		auto it = popup_flags_map.find(gauge_id);
 		return (it != popup_flags_map.end()) ? it->second : false; // Default to not a popup
 	}
+
+	// NOLINTNEXTLINE(readability-convert-member-functions-to-static)
+	bool is_gauge_shown_in_config(const SCP_string& gauge_id) const
+	{
+		HudGauge* gauge = hud_config_get_gauge_pointer(gauge_id);
+		return gauge && gauge->getVisibleInConfig();
+	}
 } HUD_CONFIG_TYPE;
 
 extern HUD_CONFIG_TYPE HUD_config;
@@ -321,11 +334,6 @@ extern SCP_map<SCP_string, SCP_vector<SCP_string>> HC_hud_primary_weapons;
 extern SCP_map<SCP_string, SCP_vector<SCP_string>> HC_hud_secondary_weapons;
 
 
-/*!
- * @brief get the gauge pointer for the given gauge index
- */
-HudGauge* hud_config_get_gauge_pointer(const SCP_string& gauge_id);
-
 /*!
  * @brief init hud config screen, setting up the hud preview display
  * 

code/pilotfile/plr_hudprefs.cpp

@@ -42,7 +42,16 @@ void hud_config_save_player_prefs(const char* callsign)
 		// Get current state
 		bool is_visible = HUD_config.is_gauge_visible(gauge_id);
 		bool is_popup = HUD_config.is_gauge_popup(gauge_id);
-		color clr = pair.second;
+
+		// Get color to save. If gauge is hidden in configure screen, then player cannot set it,
+		// so look up the parent gauge type and save/set it. --wookeejedi
+		color clr;
+		if (HUD_config.is_gauge_shown_in_config(gauge_id)) {
+			clr = pair.second;
+		} else {
+			clr = HUD_config.get_gauge_color(gauge_id, false);
+			HUD_config.set_gauge_color(gauge_id, clr);
+		}
 
 		// +Gauge: <id>
 		sprintf(format_buffer, "+Gauge: %s\n", gauge_id.c_str());