Ports/perfect_dark
1
0 Fork 1
mirror of https://github.com/perfect-dark-pc-port/perfect_dark.git synced 2026-10-23 15:52:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removing commit that was intended for a different branch

Browse Source 
This reverts commit 857e755b92.
This commit is contained in:
joshuarwood committed 2025-11-07 15:11:09 -06:00
1 parent 857e755b92
commit 7a728c7feb
3 files changed
+5 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/bg.c
-4
View File
@@ -4590,10 +4590,6 @@ bool bgTestHitInRoom(struct coord *frompos, struct coord *topos, s32 roomnum, st
numbatches = g_Rooms[roomnum].numvtxbatches; numbatches = g_Rooms[roomnum].numvtxbatches;
for (i = 0; i < numbatches; batch++, i++) { 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); j = bg0f1612e4(&batch->bbmin, &batch->bbmax, &from, &dist, &sp94, &hitthing->pos);
if (j == 0) { if (j == 0) {
src/game/prop.c
+5 -8
View File
@@ -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) bool shotTestLos(struct coord *gunpos2d, struct coord *gundir2d, struct coord *gunpos3d, struct coord *gundir3d, struct coord *endpos3d)
{ {
struct prop **propptr; struct prop **propptr;
struct hitthing hitthing; struct hitthing sp664;
struct coord delta; struct coord delta;
struct shotdata shotdata; struct shotdata shotdata;
s32 i; s32 i;
@@ -993,9 +993,6 @@ bool shotTestLos(struct coord *gunpos2d, struct coord *gundir2d, struct coord *g
RoomNum *roomsptr; RoomNum *roomsptr;
struct prop *prop; struct prop *prop;
// ignore transparent surfaces
hitthing.ignore_xlu = 1;
shotdata.gunpos3d.x = gunpos3d->x; shotdata.gunpos3d.x = gunpos3d->x;
shotdata.gunpos3d.y = gunpos3d->y; shotdata.gunpos3d.y = gunpos3d->y;
shotdata.gunpos3d.z = gunpos3d->z; 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 // Check for BG hits first
for (i = 0; rooms[i] != -1; i++) { 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 // check if it's far enough away from the end point
if (fabsf(hitthing.pos.x - endpos3d->x) >= 0.1f || if (fabsf(sp664.pos.x - endpos3d->x) >= 0.1f ||
fabsf(hitthing.pos.y - endpos3d->y) >= 0.1f || fabsf(sp664.pos.y - endpos3d->y) >= 0.1f ||
fabsf(hitthing.pos.z - endpos3d->z) >= 0.1f) { fabsf(sp664.pos.z - endpos3d->z) >= 0.1f) {
return false; return false;
} }
} }
src/include/types.h
-3
View File
@@ -5750,9 +5750,6 @@ struct hitthing {
s16 unk28; s16 unk28;
s16 texturenum; s16 texturenum;
s16 unk2c; s16 unk2c;
#ifndef PLATFORM_N64
s16 ignore_xlu;
#endif
}; };
struct hit { struct hit {