zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-25 01:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- undid some leftover placeholder code in FAFhitscan.

Browse source
This commit is contained in:
Christoph Oelckers 2022-01-01 18:39:59 +01:00
parent d215ae0c63
commit 0bfb4abc1c
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/games/sw/src/rooms.cpp
View file

@ -146,18 +146,17 @@ FAFhitscan(int32_t x, int32_t y, int32_t z, sectortype* sect,
hit.hitpos.Y -= yvect>>9; hit.hitpos.Y -= yvect>>9;
// warp to new x,y,z, sectnum // warp to new x,y,z, sectnum
sectortype* newsect = nullptr; if (Warp(&hit.hitpos.X, &hit.hitpos.Y, &hit.hitpos.Z, &hit.hitSector))
if (Warp(&hit.hitpos.X, &hit.hitpos.Y, &hit.hitpos.Z, &newsect))
{ {
// hitscan needs to pass through dest sect // hitscan needs to pass through dest sect
ResetWallWarpHitscan(newsect); ResetWallWarpHitscan(hit.hitSector);
// NOTE: This could be recursive I think if need be // NOTE: This could be recursive I think if need be
auto pos = hit.hitpos; auto pos = hit.hitpos;
hitscan(pos, newsect, { xvect, yvect, zvect }, hit, startclipmask); hitscan(pos, hit.hitSector, { xvect, yvect, zvect }, hit, startclipmask);
// reset hitscan block for dest sect // reset hitscan block for dest sect
SetWallWarpHitscan(newsect); SetWallWarpHitscan(hit.hitSector);
return; return;
} }