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

- renamed HITINFO fields.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-24 16:49:53 +01:00
parent 993d460420
commit 0a0cc85407
8 changed files with 153 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/games/sw/src/player.cpp
View file

@ -3444,11 +3444,11 @@ int DoPlayerWadeSuperJump(PLAYERp pp)
bsin(pp->angle.ang.asbuild() + angs[i]), // Y vector of 3D ang
0, &hitinfo, CLIPMASK_MISSILE); // Z vector of 3D ang
if (hitinfo.wall >= 0 && hitinfo.sect >= 0)
if (hitinfo.hitwall >= 0 && hitinfo.hitsect >= 0)
{
hitinfo.sect = wall[hitinfo.wall].nextsector;
hitinfo.hitsect = wall[hitinfo.hitwall].nextsector;
if (hitinfo.sect >= 0 && labs(sector[hitinfo.sect].floorz - pp->posz) < Z(50))
if (hitinfo.hitsect >= 0 && labs(sector[hitinfo.hitsect].floorz - pp->posz) < Z(50))
{
if (Distance(pp->posx, pp->posy, hitinfo.pos.x, hitinfo.pos.y) < ((((int)pp->Actor()->s().clipdist)<<2) + 256))
return true;
@ -3790,7 +3790,7 @@ bool PlayerOnLadder(PLAYERp pp)
else
{
// if you hit a wall and it is not a climb wall - forget it
if (hitinfo.wall >= 0 && wall[hitinfo.wall].lotag != TAG_WALL_CLIMB)
if (hitinfo.hitwall >= 0 && wall[hitinfo.hitwall].lotag != TAG_WALL_CLIMB)
return false;
}
}