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

- the first HitScan_ variant is gone.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-28 16:23:04 +02:00
parent fcc0d3bfea
commit 8ac5884232
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/games/blood/src/gameutil.h
View file

@ -47,11 +47,7 @@ inline int HitScan_(DBloodActor* pSprite, double z, int dx, int dy, int dz, unsi
{ {
return HitScan(pSprite, z, DVector3(dx, dy, dz) * inttoworld, nMask, a8); return HitScan(pSprite, z, DVector3(dx, dy, dz) * inttoworld, nMask, a8);
} }
[[deprecated]]
inline int HitScan_(DBloodActor* pSprite, double z, const DVector3& pos, unsigned int nMask, int a8)
{
return HitScan(pSprite, z, pos, nMask, a8);
}
int VectorScan(DBloodActor* pSprite, double nOffset, double nZOffset, const DVector3& vel, double nRange, int ac); int VectorScan(DBloodActor* pSprite, double nOffset, double nZOffset, const DVector3& vel, double nRange, int ac);
void GetZRange(DBloodActor* pSprite, double* ceilZ, Collision* ceilHit, double* floorZ, Collision* floorHit, int nDist, unsigned int nMask, unsigned int nClipParallax = 0); void GetZRange(DBloodActor* pSprite, double* ceilZ, Collision* ceilHit, double* floorZ, Collision* floorHit, int nDist, unsigned int nMask, unsigned int nClipParallax = 0);

2
source/games/blood/src/player.cpp
View file

@ -1420,7 +1420,7 @@ int ActionScan(PLAYER* pPlayer, HitInfo* out)
auto plActor = pPlayer->actor; auto plActor = pPlayer->actor;
*out = {}; *out = {};
auto pos = DVector3(plActor->spr.angle.ToVector() * 1024., pPlayer->slope * inttoworld); auto pos = DVector3(plActor->spr.angle.ToVector() * 1024., pPlayer->slope * inttoworld);
int hit = HitScan_(pPlayer->actor, pPlayer->zView, pos, 0x10000040, 128); int hit = HitScan(pPlayer->actor, pPlayer->zView, pos, 0x10000040, 128);
double hitDist = (plActor->spr.pos.XY() - gHitInfo.hitpos.XY()).Length(); double hitDist = (plActor->spr.pos.XY() - gHitInfo.hitpos.XY()).Length();
if (hitDist < 64) if (hitDist < 64)
{ {