popux/perfect_dark
1
0 Fork 0
forked from Ports/perfect_dark
Code Pull Requests Activity

protect against surface indexing errors

Browse Source
This commit is contained in:
joshuarwood committed 2025-11-09 01:30:49 -06:00
1 parent 42ef08d662
commit b53a62189b
1 file changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/game/prop.c
+6 -3
View File
@@ -992,6 +992,8 @@ bool shotTestLos(struct coord *gunpos2d, struct coord *gundir2d, struct coord *g
RoomNum spb8[8];
RoomNum *roomsptr;
struct prop *prop;
s16 texturenum;
u32 surfacetype;
shotdata.gunpos3d.x = gunpos3d->x;
shotdata.gunpos3d.y = gunpos3d->y;
@@ -1069,10 +1071,11 @@ bool shotTestLos(struct coord *gunpos2d, struct coord *gundir2d, struct coord *g
objTestHit(prop, &shotdata);
}
if (shotdata.hits[0].prop) {
texturenum = shotdata.hits[0].hitthing.texturenum;
surfacetype = (texturenum >= 0 && texturenum < NUM_TEXTURES) ? g_Textures[texturenum].surfacetype : SURFACETYPE_DEFAULT;
// ignore some glass parts and shields
if (shotdata.hits[0].slowsbullet && shotdata.hits[0].hitthing.texturenum != 10000 &&
g_Textures[shotdata.hits[0].hitthing.texturenum].surfacetype != SURFACETYPE_GLASS &&
g_Textures[shotdata.hits[0].hitthing.texturenum].surfacetype != SURFACETYPE_GLASSXLU) {
if (shotdata.hits[0].slowsbullet && texturenum != 10000 &&
surfacetype != SURFACETYPE_GLASS && surfacetype != SURFACETYPE_GLASSXLU) {
return false;
}
}