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

- hitscan call in operatetripbomb

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-14 21:36:45 +02:00
parent 89cb29292c
commit 47dc2e6b1f
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/duke/src/player_d.cpp
View file

@ -2052,7 +2052,7 @@ int operateTripbomb(int snum)
auto p = &ps[snum]; auto p = &ps[snum];
HitInfo hit{}; HitInfo hit{};
hitscan(p->player_int_pos(), p->cursector, { int(p->angle.ang.Cos() * (1 << 14)), int(p->angle.ang.Sin() * (1 << 14)), -p->horizon.sum().asq16() >> 11 }, hit, CLIPMASK1); hitscan(p->pos, p->cursector, DVector3(p->angle.ang.ToVector() * 1024, -p->horizon.sum().asbuildf() * 0.125), hit, CLIPMASK1);
if (hit.hitSector == nullptr || hit.actor()) if (hit.hitSector == nullptr || hit.actor())
return 0; return 0;

7
source/games/duke/src/premap.cpp
View file

@ -535,7 +535,6 @@ void resetpspritevars(int g)
{ {
int i, j; int i, j;
int circ; int circ;
int firstx, firsty;
int aimmode[MAXPLAYERS]; int aimmode[MAXPLAYERS];
STATUSBARTYPE tsbar[MAXPLAYERS]; STATUSBARTYPE tsbar[MAXPLAYERS];
@ -607,12 +606,6 @@ void resetpspritevars(int g)
if (numplayersprites == MAXPLAYERS) if (numplayersprites == MAXPLAYERS)
I_Error("Too many player sprites (max 16.)"); I_Error("Too many player sprites (max 16.)");
if (numplayersprites == 0)
{
firstx = ps[0].player_int_pos().X;
firsty = ps[0].player_int_pos().Y;
}
po[numplayersprites].opos = act->spr.pos; po[numplayersprites].opos = act->spr.pos;
po[numplayersprites].oa = act->int_ang(); po[numplayersprites].oa = act->int_ang();
po[numplayersprites].os = act->sector(); po[numplayersprites].os = act->sector();