Merge pull request #5526 from Goober5000/hud_set_coords

add screen resolution scaling for hud-set-coords

Author: TRBlount

code/mod_table/mod_table.cpp

@@ -129,6 +129,7 @@ bool Supernova_hits_at_zero;
 bool Show_subtitle_uses_pixels;
 int Show_subtitle_screen_base_res[2];
 int Show_subtitle_screen_adjusted_res[2];
+int HUD_set_coords_screen_base_res[2];
 bool Always_warn_player_about_unbound_keys;
 leadIndicatorBehavior Lead_indicator_behavior;
 shadow_disable_overrides Shadow_disable_overrides {false, false, false, false};
@@ -465,6 +466,21 @@ void parse_mod_table(const char *filename)
 			}
 		}
 
+		if (optional_string("$HUD-set-coords base resolution:")) {
+			int base_res[2];
+			if (stuff_int_list(base_res, 2) == 2) {
+				if (base_res[0] >= 640 && base_res[1] >= 480) {
+					HUD_set_coords_screen_base_res[0] = base_res[0];
+					HUD_set_coords_screen_base_res[1] = base_res[1];
+					mprintf(("Game Settings Table: HUD-set-coords base resolution is (%d, %d)\n", base_res[0], base_res[1]));
+				} else {
+					Warning(LOCATION, "$HUD-set-coords base resolution: arguments must be at least 640x480!");
+				}
+			} else {
+				Warning(LOCATION, "$HUD-set-coords base resolution: must specify two arguments");
+			}
+		}
+
 		optional_string("#GRAPHICS SETTINGS");
 
 		if (optional_string("$Enable External Shaders:")) {
@@ -1295,15 +1311,17 @@ void mod_table_post_process()
 	// use the same widescreen code as in adjust_base_res()
 	// This calculates an adjusted resolution if the aspect ratio of the base resolution doesn't exactly match that of the current resolution.
 	// The base resolution specified in game_settings.tbl does not need to be 1024x768 or even 4:3.
-	float aspect_quotient = ((float)gr_screen.center_w / (float)gr_screen.center_h) / ((float)Show_subtitle_screen_base_res[0] / (float)Show_subtitle_screen_base_res[1]);
-	if (aspect_quotient >= 1.0) {
-		Show_subtitle_screen_adjusted_res[0] = (int)(Show_subtitle_screen_base_res[0] * aspect_quotient);
+	float aspect_quotient_subtitle = ((float)gr_screen.center_w / (float)gr_screen.center_h) / ((float)Show_subtitle_screen_base_res[0] / (float)Show_subtitle_screen_base_res[1]);
+	if (aspect_quotient_subtitle >= 1.0) {
+		Show_subtitle_screen_adjusted_res[0] = (int)(Show_subtitle_screen_base_res[0] * aspect_quotient_subtitle);
 		Show_subtitle_screen_adjusted_res[1] = Show_subtitle_screen_base_res[1];
 	} else {
 		Show_subtitle_screen_adjusted_res[0] = Show_subtitle_screen_base_res[0];
-		Show_subtitle_screen_adjusted_res[1] = (int)(Show_subtitle_screen_base_res[1] / aspect_quotient);
+		Show_subtitle_screen_adjusted_res[1] = (int)(Show_subtitle_screen_base_res[1] / aspect_quotient_subtitle);
 	}
 	mprintf(("Game Settings Table: Show-subtitle adjusted resolution is (%d, %d)\n", Show_subtitle_screen_adjusted_res[0], Show_subtitle_screen_adjusted_res[1]));
+
+	// we don't need to calculate adjusted resolution for hud-set-coords because that function doesn't do screen scaling
 }
 
 bool mod_supports_version(int major, int minor, int build)
@@ -1416,6 +1434,8 @@ void mod_table_reset()
 	Show_subtitle_screen_base_res[1] = -1;
 	Show_subtitle_screen_adjusted_res[0] = -1;
 	Show_subtitle_screen_adjusted_res[1] = -1;
+	HUD_set_coords_screen_base_res[0] = -1;
+	HUD_set_coords_screen_base_res[1] = -1;
 	Always_warn_player_about_unbound_keys = false;
 	Lead_indicator_behavior = leadIndicatorBehavior::DEFAULT;
 	Thruster_easing = 0;

code/mod_table/mod_table.h

@@ -123,6 +123,7 @@ extern bool Supernova_hits_at_zero;
 extern bool Show_subtitle_uses_pixels;
 extern int Show_subtitle_screen_base_res[];
 extern int Show_subtitle_screen_adjusted_res[];
+extern int HUD_set_coords_screen_base_res[];
 extern bool Always_warn_player_about_unbound_keys;
 extern leadIndicatorBehavior Lead_indicator_behavior;
 extern struct shadow_disable_overrides {

code/parse/sexp.cpp

@@ -12624,6 +12624,12 @@ void sexp_hud_set_coords(int n)
 
 	HudGauge* hg = hud_get_gauge(gaugename);
 	if (hg) {
+		// we might need to adjust the coordinates
+		if (HUD_set_coords_screen_base_res[0] > 0 && HUD_set_coords_screen_base_res[1] > 0) {
+			coord_x = fl2i(i2fl(coord_x) * gr_screen.center_w / HUD_set_coords_screen_base_res[0]);
+			coord_y = fl2i(i2fl(coord_y) * gr_screen.center_h / HUD_set_coords_screen_base_res[1]);
+		}
+
 		hg->setGaugeCoords(coord_x, coord_y);
 	} else {
 		WarningEx(LOCATION, "Could not find a hud gauge named %s\n", gaugename);
@@ -39333,7 +39339,8 @@ SCP_vector<sexp_help_struct> Sexp_help = {
 
 	//WMC
 	{ OP_HUD_SET_COORDS, "hud-set-coords\r\n"
-		"\tSets the coordinates of a given HUD gauge. Works for custom and retail gauges. Takes 3 arguments...\r\n"
+		"\tSets the coordinates of a given HUD gauge. Works for custom and retail gauges. The coordinates can be configured to scale according to "
+		" screen resolution via the '$HUD-set-coords base resolution' option in game_settings.tbl. Takes 3 arguments...\r\n"
 		"\t1:\tHUD gauge to be modified\r\n"
 		"\t2:\tCoordinate X component\r\n"
 		"\t2:\tCoordinate Y component"