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

- SW: Replace use of clipmove_old() inline wrapper with clipmove() and remove inline wrappers.

Browse source
This commit is contained in:
Mitch Richters 2021-10-30 21:59:47 +11:00 • committed by Christoph Oelckers
parent 0ac63fd663
commit adcdbdc931
4 changed files with 50 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2424,7 +2424,9 @@ DoPlayerMoveBoat(PLAYERp pp)
pp->cursectnum = pp->sop->op_main_sector; // for speed
floor_dist = labs(z - pp->sop->floor_loz);
clipmove_old(&pp->posx, &pp->posy, &z, &pp->cursectnum, pp->xvect, pp->yvect, (int)pp->sop->clipdist, Z(4), floor_dist, CLIPMASK_PLAYER);
vec3_t clippos = { pp->posx, pp->posy, z };
clipmove_old(&clippos, &pp->cursectnum, pp->xvect, pp->yvect, (int)pp->sop->clipdist, Z(4), floor_dist, CLIPMASK_PLAYER);
pp->pos.vec2 = clippos.vec2;
OperateSectorObject(pp->sop, pp->angle.ang.asbuild(), pp->posx, pp->posy);
pp->cursectnum = save_sectnum; // for speed
@ -2894,9 +2896,15 @@ DoPlayerMoveVehicle(PLAYERp pp)
save_cstat = pp->SpriteP->cstat;
RESET(pp->SpriteP->cstat, CSTAT_SPRITE_BLOCK);
if (pp->sop->clipdist)
u->ret = clipmove_old(&pp->posx, &pp->posy, &z, &pp->cursectnum, pp->xvect, pp->yvect, (int)pp->sop->clipdist, Z(4), floor_dist, CLIPMASK_PLAYER);
{
vec3_t clippos = { pp->posx, pp->posy, z };
u->ret = clipmove(&clippos, &pp->cursectnum, pp->xvect, pp->yvect, (int)pp->sop->clipdist, Z(4), floor_dist, CLIPMASK_PLAYER);
pp->pos.vec2 = clippos.vec2;
}
else
{
u->ret = MultiClipMove(pp, z, floor_dist);
}
pp->SpriteP->cstat = save_cstat;
//SetupDriveCrush(pp, x, y);