From 7a728c7febf1ed44662e5bc1085b6b4f4eb4c73a Mon Sep 17 00:00:00 2001
From: joshuarwood <joshua.randall.wood@gmail.com>
Date: Fri, 7 Nov 2025 15:11:09 -0600
Subject: [PATCH] Removing commit that was intended for a different branch

This reverts commit 857e755b92952da8f57a80c0029d368353d15c48.
---
 src/game/bg.c       |  4 ----
 src/game/prop.c     | 13 +++++--------
 src/include/types.h |  3 ---
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/game/bg.c b/src/game/bg.c
index 8a2a53615..d1569bdc4 100644
--- a/src/game/bg.c
+++ b/src/game/bg.c
@@ -4590,10 +4590,6 @@ bool bgTestHitInRoom(struct coord *frompos, struct coord *topos, s32 roomnum, st
 	numbatches = g_Rooms[roomnum].numvtxbatches;
 
 	for (i = 0; i < numbatches; batch++, i++) {
-#ifndef PLATFORM_N64
-		if (hitthing->ignore_xlu && batch->type == VTXBATCHTYPE_XLU)
-			continue;
-#endif
 		j = bg0f1612e4(&batch->bbmin, &batch->bbmax, &from, &dist, &sp94, &hitthing->pos);
 
 		if (j == 0) {
diff --git a/src/game/prop.c b/src/game/prop.c
index 05118904e..ae18152d0 100644
--- a/src/game/prop.c
+++ b/src/game/prop.c
@@ -983,7 +983,7 @@ struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpo
 bool shotTestLos(struct coord *gunpos2d, struct coord *gundir2d, struct coord *gunpos3d, struct coord *gundir3d, struct coord *endpos3d)
 {
 	struct prop **propptr;
-	struct hitthing hitthing;
+	struct hitthing sp664;
 	struct coord delta;
 	struct shotdata shotdata;
 	s32 i;
@@ -993,9 +993,6 @@ bool shotTestLos(struct coord *gunpos2d, struct coord *gundir2d, struct coord *g
 	RoomNum *roomsptr;
 	struct prop *prop;
 
-	// ignore transparent surfaces
-	hitthing.ignore_xlu = 1;
-
 	shotdata.gunpos3d.x = gunpos3d->x;
 	shotdata.gunpos3d.y = gunpos3d->y;
 	shotdata.gunpos3d.z = gunpos3d->z;
@@ -1043,11 +1040,11 @@ bool shotTestLos(struct coord *gunpos2d, struct coord *gundir2d, struct coord *g
 
 	// Check for BG hits first
 	for (i = 0; rooms[i] != -1; i++) {
-		if (bgTestHitInRoom(&shotdata.gunpos3d, endpos3d, rooms[i], &hitthing)) {
+		if (bgTestHitInRoom(&shotdata.gunpos3d, endpos3d, rooms[i], &sp664)) {
 			// check if it's far enough away from the end point
-			if (fabsf(hitthing.pos.x - endpos3d->x) >= 0.1f ||
-					fabsf(hitthing.pos.y - endpos3d->y) >= 0.1f ||
-					fabsf(hitthing.pos.z - endpos3d->z) >= 0.1f) {
+			if (fabsf(sp664.pos.x - endpos3d->x) >= 0.1f ||
+					fabsf(sp664.pos.y - endpos3d->y) >= 0.1f ||
+					fabsf(sp664.pos.z - endpos3d->z) >= 0.1f) {
 				return false;
 			}
 		}
diff --git a/src/include/types.h b/src/include/types.h
index 5c5c19338..2bd8fdd2c 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -5750,9 +5750,6 @@ struct hitthing {
 	s16 unk28;
 	s16 texturenum;
 	s16 unk2c;
-#ifndef PLATFORM_N64
-	s16 ignore_xlu;
-#endif
 };
 
 struct hit {