zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed: When passing through a teleporter or portal that alters the angle, it is not sufficient that P_XYMovement adjusts the position in case a second P_TryMove call is needed, it must also change the precalculated movement vector.

This commit is contained in:
Christoph Oelckers 2016-03-09 12:49:49 +01:00
parent 40ceb0fef6
commit a605913f42
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/p_mobj.cpp
View File

@ -1983,7 +1983,7 @@ fixed_t P_XYMovement (AActor *mo, fixed_t scrollx, fixed_t scrolly)
FCheckPosition tm(!!(mo->flags2 & MF2_RIP)); FCheckPosition tm(!!(mo->flags2 & MF2_RIP));
angle_t oldangle = mo->angle;
do do
{ {
if (i_compatflags & COMPATF_WALLRUN) pushtime++; if (i_compatflags & COMPATF_WALLRUN) pushtime++;
@ -2213,13 +2213,25 @@ explode:
// If the new position does not match the desired position, the player // If the new position does not match the desired position, the player
// must have gone through a teleporter, so stop moving right now if it // must have gone through a teleporter, so stop moving right now if it
// was a regular teleporter. If it was a line-to-line or fogless teleporter, // was a regular teleporter. If it was a line-to-line or fogless teleporter,
// the move should continue, but startx and starty need to change. // the move should continue, but startx, starty and xmove, ymove need to change.
if (mo->velx == 0 && mo->vely == 0) if (mo->velx == 0 && mo->vely == 0)
{ {
step = steps; step = steps;
} }
else else
{ {
angle_t anglediff = (mo->angle - oldangle) >> ANGLETOFINESHIFT;
if (anglediff != 0)
{
fixed_t xnew = FixedMul(xmove, finecosine[anglediff]) - FixedMul(ymove, finesine[anglediff]);
fixed_t ynew = FixedMul(xmove, finesine[anglediff]) + FixedMul(ymove, finecosine[anglediff]);
xmove = xnew;
ymove = ynew;
oldangle = mo->angle; // in case more moves are needed this needs to be updated.
}
startx = mo->X() - Scale (xmove, step, steps); startx = mo->X() - Scale (xmove, step, steps);
starty = mo->Y() - Scale (ymove, step, steps); starty = mo->Y() - Scale (ymove, step, steps);
} }