teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-19 23:51:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- 3x use proper HitScan call.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-28 16:12:39 +02:00
parent e793b878c1
commit 7f5ae54f93
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/games/blood/src/nnexts.cpp
View file

@ -4634,6 +4634,7 @@ bool condCheckSprite(DBloodActor* aCond, int cmpOp, bool PUSH)
case 36: // hitscan: floor? case 36: // hitscan: floor?
case 37: // hitscan: wall? case 37: // hitscan: wall?
case 38: // hitscan: sprite? case 38: // hitscan: sprite?
{
switch (arg1) switch (arg1)
{ {
case 0: arg1 = CLIPMASK0 | CLIPMASK1; break; case 0: arg1 = CLIPMASK0 | CLIPMASK1; break;
@ -4641,18 +4642,19 @@ bool condCheckSprite(DBloodActor* aCond, int cmpOp, bool PUSH)
case 2: arg1 = CLIPMASK1; break; case 2: arg1 = CLIPMASK1; break;
} }
double range = arg3 / 8.;
if ((pPlayer = getPlayerById(objActor->spr.type)) != NULL) if ((pPlayer = getPlayerById(objActor->spr.type)) != NULL)
var = HitScan_(objActor, pPlayer->zWeapon, pPlayer->aim.dx, pPlayer->aim.dy, pPlayer->aim.dz, arg1, arg3 << 1); var = HitScan_(objActor, pPlayer->zWeapon, pPlayer->aim.dx, pPlayer->aim.dy, pPlayer->aim.dz, arg1, arg3 << 1);
else if (objActor->IsDudeActor()) else if (objActor->IsDudeActor())
var = HitScan_(objActor, objActor->spr.pos.Z, DVector3(objActor->spr.angle.ToVector() * 1024, (!objActor->hasX()) ? 0 : objActor->dudeSlope * inttoworld), arg1, arg3 << 1); var = HitScan(objActor, objActor->spr.pos.Z, DVector3(objActor->spr.angle.ToVector() * 1024, (!objActor->hasX()) ? 0 : objActor->dudeSlope * inttoworld), arg1, range);
else if ((objActor->spr.cstat & CSTAT_SPRITE_ALIGNMENT_MASK) == CSTAT_SPRITE_ALIGNMENT_FLOOR) else if ((objActor->spr.cstat & CSTAT_SPRITE_ALIGNMENT_MASK) == CSTAT_SPRITE_ALIGNMENT_FLOOR)
{ {
var3 = (objActor->spr.cstat & CSTAT_SPRITE_YFLIP) ? 8192 : -8192; // was 0x20000 - HitScan uses Q28.4 for dz! var3 = (objActor->spr.cstat & CSTAT_SPRITE_YFLIP) ? 8192 : -8192; // was 0x20000 - HitScan uses Q28.4 for dz!
var = HitScan_(objActor, objActor->spr.pos.Z, DVector3(objActor->spr.angle.ToVector() * 1024, var3), arg1, arg3 << 1); var = HitScan(objActor, objActor->spr.pos.Z, DVector3(objActor->spr.angle.ToVector() * 1024, var3), arg1, range);
} }
else else
{ {
var = HitScan_(objActor, objActor->spr.pos.Z, DVector3(objActor->spr.angle.ToVector() * 1024, 0), arg1, arg3 << 1); var = HitScan(objActor, objActor->spr.pos.Z, DVector3(objActor->spr.angle.ToVector() * 1024, 0), arg1, range);
} }
if (var < 0) if (var < 0)
@ -4677,7 +4679,7 @@ bool condCheckSprite(DBloodActor* aCond, int cmpOp, bool PUSH)
return true; return true;
} }
break; break;
}
case 45: // this sprite is a target of some dude? case 45: // this sprite is a target of some dude?
BloodStatIterator it(kStatDude); BloodStatIterator it(kStatDude);
while (auto iactor = it.Next()) while (auto iactor = it.Next())