From 0120a0a8dae6444ea4e42bb47ec9cbdce4a98db8 Mon Sep 17 00:00:00 2001
From: Jonas Volman <theunknowentity@gmail.com>
Date: Thu, 16 Jul 2026 19:34:45 -0700
Subject: [PATCH] Match collision BSP sphere and vector queries

---
 source/physics/collision_bsp.c | 123 +++++++++++++++++++++++++++++++++
 source/physics/collision_bsp.h |  11 ++-
 2 files changed, 133 insertions(+), 1 deletion(-)

diff --git a/source/physics/collision_bsp.c b/source/physics/collision_bsp.c
index 1315d0b4..95be9d57 100644
--- a/source/physics/collision_bsp.c
+++ b/source/physics/collision_bsp.c
@@ -79,6 +79,8 @@ symbols in this file:
 #include "cseries/cseries.h"
 #include "collision_bsp.h"
 #include "collision_bsp_definitions.h"
+#include "collision_usage.h"
+#include "scenario/scenario.h"
 #include "tag_files/tag_groups.h"
 
 /* ---------- constants */
@@ -121,6 +123,47 @@ struct collision_bsp_test_pill_context
 typedef char collision_bsp_test_pill_context_size_assert[
 	sizeof(struct collision_bsp_test_pill_context) == 0x22C ? 1 : -1];
 
+struct collision_bsp_test_sphere_context
+{
+	struct collision_bsp const *bsp;
+	short breakable_surface_count;
+	short pad;
+	byte const *breakable_surface_flags;
+	real_point3d const *center;
+	real radius;
+	struct collision_bsp_test_sphere_result *result;
+	long stack_depth;
+	long traversal_stack[131];
+};
+
+typedef char collision_bsp_test_sphere_context_size_assert[
+	sizeof(struct collision_bsp_test_sphere_context) == 0x228 ? 1 : -1];
+
+struct collision_bsp_test_vector_context
+{
+	unsigned long flags;
+	struct collision_bsp const *bsp;
+	short breakable_surface_count;
+	short pad;
+	byte const *breakable_surface_flags;
+	real_point3d const *point;
+	real_vector3d const *vector;
+	struct collision_bsp_test_vector_result *result;
+	long surface_index;
+	byte result_flags;
+	byte pad2[3];
+	long leaf_index;
+};
+
+typedef char collision_bsp_test_vector_context_size_assert[
+	sizeof(struct collision_bsp_test_vector_context) == 0x28 ? 1 : -1];
+
+struct collision_bsp_usage_times
+{
+	__int64 vector;
+	__int64 sphere;
+};
+
 /* ---------- prototypes */
 
 boolean code_00137c90(
@@ -131,9 +174,19 @@ boolean code_00137c90(
 boolean code_00138ed0(
 	struct collision_bsp_test_pill_context *context,
 	long node_index);
+void code_001383e0(
+	struct collision_bsp_test_sphere_context *context,
+	long node_index);
+boolean code_00138700(
+	struct collision_bsp_test_vector_context *context,
+	long node_index,
+	long stack_depth,
+	real maximum_t);
 
 /* ---------- globals */
 
+struct collision_bsp_usage_times bss_00456eb0 = { 0 };
+
 /* ---------- public code */
 
 short collision_surface_edge_count(
@@ -550,4 +603,74 @@ boolean collision_bsp_test_pill(
 	return code_00138ed0(&context, 0);
 }
 
+boolean collision_bsp_test_sphere(
+	struct collision_bsp const *bsp,
+	short breakable_surface_count,
+	byte const *breakable_surface_flags,
+	real_point3d const *center,
+	real radius,
+	struct collision_bsp_test_sphere_result *result)
+{
+	struct collision_bsp_test_sphere_context context;
+	short collision_function = 6 + (bsp == global_collision_bsp);
+
+	collision_log_usage(collision_function);
+	collision_log_start_time(&bss_00456eb0.sphere);
+
+	context.bsp = bsp;
+	context.breakable_surface_count = breakable_surface_count;
+	context.breakable_surface_flags = breakable_surface_flags;
+	context.center = center;
+	context.radius = radius;
+	context.result = result;
+	context.stack_depth = 0;
+	result->leaf_count = 0;
+	result->surface_count = 0;
+	result->edge_count = 0;
+	result->vertex_count = 0;
+
+	code_001383e0(&context, 0);
+	collision_log_end_time(collision_function, bss_00456eb0.sphere);
+
+	return result->surface_count > 0 || result->edge_count > 0;
+}
+
+boolean collision_bsp_test_vector(
+	unsigned long flags,
+	struct collision_bsp const *bsp,
+	short breakable_surface_count,
+	byte const *breakable_surface_flags,
+	real_point3d const *point,
+	real_vector3d const *vector,
+	real maximum_t,
+	struct collision_bsp_test_vector_result *result)
+{
+	struct collision_bsp_test_vector_context context;
+	short collision_function = 4 + (bsp == global_collision_bsp);
+	boolean return_value;
+	real t;
+
+	collision_log_usage(collision_function);
+	collision_log_start_time(&bss_00456eb0.vector);
+
+	context.flags = flags;
+	context.bsp = bsp;
+	context.breakable_surface_count = breakable_surface_count;
+	context.breakable_surface_flags = breakable_surface_flags;
+	context.point = point;
+	context.vector = vector;
+	context.result = result;
+	result->t = maximum_t < 0.f ? 0.f : maximum_t;
+	context.surface_index = NONE;
+	context.leaf_index = NONE;
+	result->leaf_count = 0;
+	context.result_flags = 0;
+
+	t = PIN(maximum_t, 0.f, 1.f);
+	return_value = code_00138700(&context, 0, 0, t);
+	collision_log_end_time(collision_function, bss_00456eb0.vector);
+
+	return return_value;
+}
+
 /* ---------- private code */
diff --git a/source/physics/collision_bsp.h b/source/physics/collision_bsp.h
index 1570541c..8f72e3e0 100644
--- a/source/physics/collision_bsp.h
+++ b/source/physics/collision_bsp.h
@@ -144,9 +144,18 @@ boolean collision_bsp_test_sphere(
 	struct collision_bsp const *bsp,
 	short breakable_surface_count,
 	byte const *breakable_surface_flags,
-	union real_point3d const *center,
+	real_point3d const *center,
 	real radius,
 	struct collision_bsp_test_sphere_result *result);
+boolean collision_bsp_test_vector(
+	unsigned long flags,
+	struct collision_bsp const *bsp,
+	short breakable_surface_count,
+	byte const *breakable_surface_flags,
+	real_point3d const *point,
+	real_vector3d const *vector,
+	real maximum_t,
+	struct collision_bsp_test_vector_result *result);
 
 /* ---------- globals */