teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- gave Blood the same treatment.

Browse source
This commit is contained in:
Christoph Oelckers 2020-08-27 00:21:11 +02:00
parent c7e667a17a
commit 99486cba7e
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/blood/src/blood.cpp
View file

@ -527,8 +527,8 @@ void ProcessFrame(void)
{
gPlayer[i].input.syncFlags.value &= ~flag_buttonmask;
gPlayer[i].input.syncFlags.value |= gFifoInput[gNetFifoTail & 255][i].syncFlags.value;
if (gFifoInput[gNetFifoTail&255][i].syncFlags.newWeapon)
gPlayer[i].newWeapon = gFifoInput[gNetFifoTail&255][i].syncFlags.newWeapon;
int newweap = gFifoInput[gNetFifoTail & 255][i].getNewWeapon();
if (newweap) gPlayer[i].newWeapon = newweap;
gPlayer[i].input.fvel = gFifoInput[gNetFifoTail&255][i].fvel;
gPlayer[i].input.q16avel = gFifoInput[gNetFifoTail&255][i].q16avel;
gPlayer[i].input.svel = gFifoInput[gNetFifoTail&255][i].svel;

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

@ -151,7 +151,7 @@ void ctrlGetInput(void)
gInput.syncFlags.value |= BitsToSend.value;
if (WeaponToSend != 0)
gInput.syncFlags.newWeapon = WeaponToSend;
gInput.SetNewWeapon(WeaponToSend);
BitsToSend.value = 0;
WeaponToSend = 0;

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

@ -1331,7 +1331,7 @@ void ProcessInput(PLAYER *pPlayer)
pPlayer->q16horiz = mulscale16(0x8000-(Cos(ClipHigh(pPlayer->deathTime*8, 1024))>>15), fix16_from_int(120));
}
if (pPlayer->curWeapon)
pInput->syncFlags.newWeapon = pPlayer->curWeapon;
pInput->SetNewWeapon(pPlayer->curWeapon);
if (pInput->syncFlags.action)
{
if (bSeqStat)

2
source/core/packet.h
View file

@ -37,7 +37,6 @@ enum EDukeSyncBits_ : uint32_t
SKB_RUN = 1 << 5,
SKB_LOOK_LEFT = 1 << 6,
SKB_LOOK_RIGHT = 1 << 7,
SKB_FIRST_WEAPON_BIT = 1 << 8,
SKB_STEROIDS = 1 << 12,
SKB_LOOK_UP = 1 << 13,
SKB_LOOK_DOWN = 1 << 14,
@ -103,7 +102,6 @@ union SYNCFLAGS
unsigned int useCrystalBall : 1;
unsigned int useJumpBoots : 1;
unsigned int useMedKit : 1;
unsigned int newWeapon : 4;
};
};