vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bump-fixes' into 'next' 

Push bouncing players backwards if they get stuck in a wall

See merge request KartKrew/Kart-Public!3
This commit is contained in:
Sal 2019-01-03 12:27:14 -05:00
parent 0b0cbcabb7 2b870ef6d4
commit e52d5fd2fd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/p_map.c
View File

@ -3809,6 +3809,7 @@ void P_BouncePlayerMove(mobj_t *mo)
fixed_t leadx, leady;
fixed_t trailx, traily;
fixed_t mmomx = 0, mmomy = 0;
fixed_t oldmomx = mo->momx, oldmomy = mo->momy;
if (!mo->player)
return;
@ -3897,7 +3898,9 @@ void P_BouncePlayerMove(mobj_t *mo)
mo->player->cmomx = tmxmove;
mo->player->cmomy = tmymove;
P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove, true);
if (!P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove, true)) {
P_TryMove(mo, mo->x - oldmomx, mo->y - oldmomy, true);
}
}
//