Remove parameters from gauge_settings constructor and change values after struct creation.

Author: Yarn366

code/hud/hudparse.cpp

@@ -446,14 +446,18 @@ void parse_hud_gauges_tbl(const char *filename)
 				gauge_type = parse_gauge_type();
 
 				// change some of the default gauge settings to the appropriate values.
-				gauge_settings settings(&ship_classes, use_font, scale_gauge, force_scaling_above_res, use_clr_p);
+				gauge_settings settings;
+				settings.font_num = use_font;
+				settings.scale_gauge = scale_gauge;
+				memcpy(settings.force_scaling_above_res, force_scaling_above_res, sizeof(settings.force_scaling_above_res));
+				settings.ship_idx = &ship_classes;
+				settings.use_clr = use_clr_p;
 
 				// if "default" is specified, then the base resolution is {-1, -1},
 				// indicating GR_640 or GR_1024 to the handlers. otherwise, change it
 				// to the given base resolution.
 				if (!optional_string("default")) {
-					settings.base_res[0] = base_res[0];
-					settings.base_res[1] = base_res[1];
+					memcpy(settings.base_res, base_res, sizeof(settings.base_res));
 				}
 
 				// then call the specific gauge load handler function for this gauge type.
@@ -573,7 +577,8 @@ void load_missing_retail_gauges()
 				}
 
 				if(!retail_gauge_loaded) {
-					gauge_settings settings(&sindex);
+					gauge_settings settings;
+					settings.ship_idx = &sindex;
 					load_gauge(retail_gauges[i], &settings);
 				}
 			}
@@ -590,7 +595,8 @@ void load_missing_retail_gauges()
 
 			// load radar gauge if not loaded.
 			if(!retail_gauge_loaded) {
-				gauge_settings settings(&sindex);
+				gauge_settings settings;
+				settings.ship_idx = &sindex;
 				load_gauge((Cmdline_orb_radar ? HUD_OBJECT_RADAR_ORB : HUD_OBJECT_RADAR_STD), &settings);
 			}
 
@@ -604,7 +610,8 @@ void load_missing_retail_gauges()
 				}
 
 				if(!retail_gauge_loaded) {
-					gauge_settings settings(&sindex);
+					gauge_settings settings;
+					settings.ship_idx = &sindex;
 					load_gauge(HUD_OBJECT_WEAPON_LINKING, &settings);
 				}
 			}

code/hud/hudparse.h

@@ -25,11 +25,11 @@ extern int Force_scaling_above_res_global[2];
 extern int Hud_font;
 
 typedef struct gauge_settings {
-	SCP_vector<int>* ship_idx;
 	int base_res[2];
 	int font_num;
 	bool scale_gauge;
 	int force_scaling_above_res[2];
+	SCP_vector<int>* ship_idx;
 	color *use_clr;
 	float origin[2];
 	int offset[2];
@@ -39,11 +39,10 @@ typedef struct gauge_settings {
 	bool set_colour;
 	bool slew;
 
-	gauge_settings(SCP_vector<int>* _ship_idx = NULL, int _font_num = Hud_font, bool _scale_gauge = Scale_retail_gauges, int _force_scaling_above_res[2] = Force_scaling_above_res_global, color *_use_clr = NULL)
-			: ship_idx(_ship_idx), font_num(_font_num), scale_gauge(_scale_gauge), use_clr(_use_clr), use_coords(false), set_position(true), set_colour(true)/*, slew(false)*/ {
+	gauge_settings() : font_num(Hud_font), scale_gauge(Scale_retail_gauges), ship_idx(nullptr), use_clr(nullptr), use_coords(false), set_position(true), set_colour(true), slew(false) {
 		base_res[0] = -1;
 		base_res[1] = -1;
-		memcpy(force_scaling_above_res, _force_scaling_above_res, sizeof(force_scaling_above_res));
+		memcpy(force_scaling_above_res, Force_scaling_above_res_global, sizeof(force_scaling_above_res));
 		origin[0] = 0.0f;
 		origin[1] = 0.0f;
 		offset[0] = 0;