zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-16 12:40:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

SW: Lock angle and horiz right after teleporting to sprite

Browse source
This commit is contained in:
NY00123 2020-04-16 21:43:14 +03:00 committed by Christoph Oelckers
parent 8e9130c31a
commit e2a789b8cc
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/sw/src/game.cpp
View file

@ -3281,12 +3281,13 @@ getinput(SW_PACKET *loc, SWBOOL tied)
q16angvel = fix16_clamp(q16angvel, -fix16_from_int(MAXANGVEL), fix16_from_int(MAXANGVEL)); q16angvel = fix16_clamp(q16angvel, -fix16_from_int(MAXANGVEL), fix16_from_int(MAXANGVEL));
q16aimvel = fix16_clamp(q16aimvel, -fix16_from_int(MAXHORIZVEL), fix16_from_int(MAXHORIZVEL)); q16aimvel = fix16_clamp(q16aimvel, -fix16_from_int(MAXHORIZVEL), fix16_from_int(MAXHORIZVEL));
void DoPlayerTeleportPause(PLAYERp pp);
if (PedanticMode) if (PedanticMode)
{ {
q16angvel = fix16_floor(q16angvel); q16angvel = fix16_floor(q16angvel);
q16aimvel = fix16_floor(q16aimvel); q16aimvel = fix16_floor(q16aimvel);
} }
else if (!TEST(pp->Flags, PF_DEAD)) else if (!TEST(pp->Flags, PF_DEAD) && (pp->DoPlayerAction != DoPlayerTeleportPause))
{ {
if (!TEST(pp->Flags, PF_CLIMBING) && !pp->sop_control) if (!TEST(pp->Flags, PF_CLIMBING) && !pp->sop_control)
DoPlayerTurn(pp, &pp->camq16ang, q16angvel); DoPlayerTurn(pp, &pp->camq16ang, q16angvel);

1
source/sw/src/player.cpp
View file

@ -1333,6 +1333,7 @@ void
DoPlayerTeleportToSprite(PLAYERp pp, SPRITEp sp) DoPlayerTeleportToSprite(PLAYERp pp, SPRITEp sp)
{ {
pp->camq16ang = pp->q16ang = pp->oq16ang = fix16_from_int(sp->ang); pp->camq16ang = pp->q16ang = pp->oq16ang = fix16_from_int(sp->ang);
pp->camq16horiz = pp->q16horiz; // Ensure horiz is initially locked
pp->posx = pp->oposx = pp->oldposx = sp->x; pp->posx = pp->oposx = pp->oldposx = sp->x;
pp->posy = pp->oposy = pp->oldposy = sp->y; pp->posy = pp->oposy = pp->oldposy = sp->y;