zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-05 21:30:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Blood: Force synchronised input while a revolving door is busy/in-use.

Browse source 
* Fixes #205.
This commit is contained in:
Mitchell Richters 2020-12-01 07:43:12 +11:00
parent 22f7fc93f4
commit 232dd5e07a
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/blood/src/player.cpp
View file

@ -1435,9 +1435,12 @@ void ProcessInput(PLAYER *pPlayer)
if (cl_syncinput) if (cl_syncinput)
{ {
applylook(&pPlayer->angle, pInput->avel, &pInput->actions); applylook(&pPlayer->angle, pInput->avel, &pInput->actions);
UpdatePlayerSpriteAngle(pPlayer);
} }
// unconditionally update the player's sprite angle
// in case game is forcing synchronised input.
UpdatePlayerSpriteAngle(pPlayer);
if (!(pInput->actions & SB_JUMP)) if (!(pInput->actions & SB_JUMP))
pPlayer->cantJump = 0; pPlayer->cantJump = 0;
@ -1647,6 +1650,10 @@ void playerProcess(PLAYER *pPlayer)
int nXSprite = pSprite->extra; int nXSprite = pSprite->extra;
XSPRITE *pXSprite = pPlayer->pXSprite; XSPRITE *pXSprite = pPlayer->pXSprite;
POSTURE* pPosture = &pPlayer->pPosture[pPlayer->lifeMode][pPlayer->posture]; POSTURE* pPosture = &pPlayer->pPosture[pPlayer->lifeMode][pPlayer->posture];
// disable synchronised input if set by game.
resetForcedSyncInput();
powerupProcess(pPlayer); powerupProcess(pPlayer);
int top, bottom; int top, bottom;
GetSpriteExtents(pSprite, &top, &bottom); GetSpriteExtents(pSprite, &top, &bottom);

2
source/blood/src/triggers.cpp
View file

@ -1714,6 +1714,8 @@ void LinkSector(int nSector, XSECTOR *pXSector, EVENT event)
break; break;
case kSectorRotateMarked: case kSectorRotateMarked:
case kSectorRotate: case kSectorRotate:
// force synchronised input here for now.
setForcedSyncInput();
RDoorBusy(nSector, nBusy); RDoorBusy(nSector, nBusy);
break; break;
default: default: