teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-20 18:52:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Blood: Re-implement unsynchronised q16ang.

Browse source
This commit is contained in:
Mitchell Richters 2020-09-16 18:22:01 +10:00
parent 547bf110b2
commit ae5b6b6a91
2 changed files with 46 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/blood/src/controls.cpp
View file

@ -39,6 +39,8 @@ BEGIN_BLD_NS
static InputPacket gInput;
void applylook(PLAYER *pPlayer, fixed_t const q16avel, double const scaleAdjust);
static void GetInputInternal(ControlInfo* const hidInput)
{
double const scaleAdjust = InputScale();
@ -148,6 +150,11 @@ static void GetInputInternal(ControlInfo* const hidInput)
gInput.svel = clamp(gInput.svel + input.svel, -2048, 2048);
gInput.q16avel += input.q16avel;
gInput.q16horz = clamp(gInput.q16horz + input.q16horz, IntToFixed(-127) >> 2, IntToFixed(127) >> 2);
if (!cl_syncinput && gamestate == GS_LEVEL)
{
applylook(&gPlayer[myconnectindex], input.q16avel, scaleAdjust);
}
}
void GameInterface::GetInput(InputPacket* packet, ControlInfo* const hidInput)

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

@ -1304,6 +1304,41 @@ int ActionScan(PLAYER *pPlayer, int *a2, int *a3)
return -1;
}
void applylook(PLAYER *pPlayer, fixed_t const q16avel, double const scaleAdjust)
{
spritetype *pSprite = pPlayer->pSprite;
InputPacket *pInput = &pPlayer->input;
if (q16avel)
{
pPlayer->q16ang = (pPlayer->q16ang + q16avel) & 0x7FFFFFF;
}
if (pInput->actions & SB_TURNAROUND)
{
if (pPlayer->spin == 0.)
{
pPlayer->spin = -1024.;
}
pInput->actions &= ~SB_TURNAROUND;
}
if (pPlayer->spin < 0.)
{
double const speed = scaleAdjust * (pPlayer->posture == 1 ? 64. : 128.);
pPlayer->spin = min(pPlayer->spin + speed, 0.);
pPlayer->q16ang += FloatToFixed(speed);
if (pPlayer->spin > -1.)
{
pPlayer->spin = 0.;
}
}
pPlayer->q16ang = (pPlayer->q16ang + IntToFixed(pSprite->ang - pPlayer->angold)) & 0x7FFFFFF;
pPlayer->angold = pSprite->ang = FixedToInt(pPlayer->q16ang);
}
void ProcessInput(PLAYER *pPlayer)
{
enum
@ -1415,26 +1450,12 @@ void ProcessInput(PLAYER *pPlayer)
yvel[nSprite] -= mulscale30(strafe, x);
}
}
if (pInput->q16avel)
pPlayer->q16ang = (pPlayer->q16ang+pInput->q16avel)&0x7ffffff;
if (pInput->actions & SB_TURNAROUND)
if (cl_syncinput)
{
if (!pPlayer->spin)
pPlayer->spin = -1024;
pInput->actions &= ~SB_TURNAROUND;
applylook(pPlayer, pInput->q16avel, 1);
}
if (pPlayer->spin < 0)
{
int speed;
if (pPlayer->posture == 1)
speed = 64;
else
speed = 128;
pPlayer->spin = min(pPlayer->spin+speed, 0);
pPlayer->q16ang += IntToFixed(speed);
}
pPlayer->q16ang = (pPlayer->q16ang+IntToFixed(pSprite->ang-pPlayer->angold))&0x7ffffff;
pPlayer->angold = pSprite->ang = FixedToInt(pPlayer->q16ang);
if (!(pInput->actions & SB_JUMP))
pPlayer->cantJump = 0;