Merge pull request scp-fs2open#7261 from Goober5000/fix_assert

Goober5000 · web-flow · commit ffa1bb290338 · 2026-03-02T23:25:16.000-05:00
fix waypoint list assertions
diff --git a/code/object/waypoint.h b/code/object/waypoint.h
@@ -109,8 +109,8 @@ void waypoint_stuff_name(STR &dest, int waypoint_instance)
 {
 	int wl_index, wp_index;
 	calc_waypoint_indexes(waypoint_instance, wl_index, wp_index);
-	Assertion(wl_index >= 0, "Waypoint list must exist!");
-	Assertion(Waypoint_lists.in_bounds(wp_index), "Waypoint index must be in bounds!");
+	Assertion(Waypoint_lists.in_bounds(wl_index), "Waypoint list index must be in bounds!");
+	Assertion(Waypoint_lists[wl_index].get_waypoints().in_bounds(wp_index), "Waypoint index must be in bounds!");
 	waypoint_stuff_name(dest, Waypoint_lists[wl_index].get_name(), wp_index + 1);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,8 @@ void waypoint_stuff_name(STR &dest, int waypoint_instance)`
`109`	`109`	`{`
`110`	`110`	`int wl_index, wp_index;`
`111`	`111`	`calc_waypoint_indexes(waypoint_instance, wl_index, wp_index);`
`112`		`- Assertion(wl_index >= 0, "Waypoint list must exist!");`
`113`		`- Assertion(Waypoint_lists.in_bounds(wp_index), "Waypoint index must be in bounds!");`
	`112`	`+ Assertion(Waypoint_lists.in_bounds(wl_index), "Waypoint list index must be in bounds!");`
	`113`	`+ Assertion(Waypoint_lists[wl_index].get_waypoints().in_bounds(wp_index), "Waypoint index must be in bounds!");`
`114`	`114`	`waypoint_stuff_name(dest, Waypoint_lists[wl_index].get_name(), wp_index + 1);`
`115`	`115`	`}`
`116`	`116`