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

Rename stupid structure member I probably named when I was high

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7775 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-07-08 00:41:17 +00:00 committed by Christoph Oelckers
parent 19e54dc1ad
commit fa5ff547c8
10 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/duke3d/src/actors.cpp
View file

@ -3368,7 +3368,7 @@ ACTOR_STATIC void G_MoveWeapons(void)
static int P_Submerge(int const playerNum, DukePlayer_t * const pPlayer, int const sectNum, int const otherSect) static int P_Submerge(int const playerNum, DukePlayer_t * const pPlayer, int const sectNum, int const otherSect)
{ {
if (pPlayer->on_ground && pPlayer->pos.z >= sector[sectNum].floorz if (pPlayer->on_ground && pPlayer->pos.z >= sector[sectNum].floorz
&& (TEST_SYNC_KEY(g_player[playerNum].inputBits->bits, SK_CROUCH) || pPlayer->vel.z > 2048)) && (TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_CROUCH) || pPlayer->vel.z > 2048))
// if( onfloorz && sectlotag == 1 && ps->pos.z > (sector[sect].floorz-(6<<8)) ) // if( onfloorz && sectlotag == 1 && ps->pos.z > (sector[sect].floorz-(6<<8)) )
{ {
if (screenpeek == playerNum) if (screenpeek == playerNum)
@ -3384,7 +3384,7 @@ static int P_Submerge(int const playerNum, DukePlayer_t * const pPlayer, int con
pPlayer->opos.z = pPlayer->pos.z = sector[otherSect].ceilingz; pPlayer->opos.z = pPlayer->pos.z = sector[otherSect].ceilingz;
if (TEST_SYNC_KEY(g_player[playerNum].inputBits->bits, SK_CROUCH)) if (TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_CROUCH))
pPlayer->vel.z += 512; pPlayer->vel.z += 512;
return 1; return 1;
@ -3544,12 +3544,12 @@ ACTOR_STATIC void G_MoveTransports(void)
} }
if (onFloor == 0 && klabs(SZ(spriteNum) - pPlayer->pos.z) < 6144) if (onFloor == 0 && klabs(SZ(spriteNum) - pPlayer->pos.z) < 6144)
if (!pPlayer->jetpack_on || TEST_SYNC_KEY(g_player[playerNum].inputBits->bits, SK_JUMP) if (!pPlayer->jetpack_on || TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_JUMP)
|| TEST_SYNC_KEY(g_player[playerNum].inputBits->bits, SK_CROUCH)) || TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_CROUCH))
{ {
pPlayer->pos.x += sprite[OW(spriteNum)].x - SX(spriteNum); pPlayer->pos.x += sprite[OW(spriteNum)].x - SX(spriteNum);
pPlayer->pos.y += sprite[OW(spriteNum)].y - SY(spriteNum); pPlayer->pos.y += sprite[OW(spriteNum)].y - SY(spriteNum);
pPlayer->pos.z = (pPlayer->jetpack_on && (TEST_SYNC_KEY(g_player[playerNum].inputBits->bits, SK_JUMP) pPlayer->pos.z = (pPlayer->jetpack_on && (TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_JUMP)
|| pPlayer->jetpack_on < 11)) || pPlayer->jetpack_on < 11))
? sprite[OW(spriteNum)].z - 6144 ? sprite[OW(spriteNum)].z - 6144
: sprite[OW(spriteNum)].z + 6144; : sprite[OW(spriteNum)].z + 6144;
@ -3960,7 +3960,7 @@ ACTOR_STATIC void G_MoveActors(void)
{ {
int const angDiff = G_GetAngleDelta(fix16_to_int(pPlayer->q16ang),getangle(pSprite->x-pPlayer->pos.x,pSprite->y-pPlayer->pos.y)); int const angDiff = G_GetAngleDelta(fix16_to_int(pPlayer->q16ang),getangle(pSprite->x-pPlayer->pos.x,pSprite->y-pPlayer->pos.y));
if (angDiff > -64 && angDiff < 64 && TEST_SYNC_KEY(g_player[playerNum].inputBits->bits, SK_OPEN) if (angDiff > -64 && angDiff < 64 && TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_OPEN)
&& pPlayer->toggle_key_flag == 1) && pPlayer->toggle_key_flag == 1)
{ {
int ballSprite; int ballSprite;
@ -4367,7 +4367,7 @@ ACTOR_STATIC void G_MoveActors(void)
pSprite->ang = fix16_to_int(pPlayer->q16ang); pSprite->ang = fix16_to_int(pPlayer->q16ang);
if ((TEST_SYNC_KEY(g_player[playerNum].inputBits->bits, SK_FIRE) || (pPlayer->quick_kick > 0)) && sprite[pPlayer->i].extra > 0) if ((TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_FIRE) || (pPlayer->quick_kick > 0)) && sprite[pPlayer->i].extra > 0)
if (pPlayer->quick_kick > 0 || if (pPlayer->quick_kick > 0 ||
(PWEAPON(playerNum, pPlayer->curr_weapon, WorksLike) != HANDREMOTE_WEAPON && PWEAPON(playerNum, pPlayer->curr_weapon, WorksLike) != HANDBOMB_WEAPON && (PWEAPON(playerNum, pPlayer->curr_weapon, WorksLike) != HANDREMOTE_WEAPON && PWEAPON(playerNum, pPlayer->curr_weapon, WorksLike) != HANDBOMB_WEAPON &&
PWEAPON(playerNum, pPlayer->curr_weapon, WorksLike) != TRIPBOMB_WEAPON && pPlayer->ammo_amount[pPlayer->curr_weapon] >= 0)) PWEAPON(playerNum, pPlayer->curr_weapon, WorksLike) != TRIPBOMB_WEAPON && pPlayer->ammo_amount[pPlayer->curr_weapon] >= 0))

2
source/duke3d/src/demo.cpp
View file

@ -295,7 +295,7 @@ void G_DemoRecord(void)
for (TRAVERSE_CONNECT(i)) for (TRAVERSE_CONNECT(i))
{ {
Bmemcpy(&recsync[ud.reccnt], g_player[i].inputBits, sizeof(input_t)); Bmemcpy(&recsync[ud.reccnt], g_player[i].input, sizeof(input_t));
ud.reccnt++; ud.reccnt++;
} }

20
source/duke3d/src/game.cpp
View file

@ -3937,17 +3937,17 @@ void G_DoSpriteAnimations(int32_t ourx, int32_t oury, int32_t oura, int32_t smoo
{ {
static int32_t targetang = 0; static int32_t targetang = 0;
if (g_player[playerNum].inputBits->extbits&(1<<1)) if (g_player[playerNum].input->extbits&(1<<1))
{ {
if (g_player[playerNum].inputBits->extbits&(1<<2))targetang += 16; if (g_player[playerNum].input->extbits&(1<<2))targetang += 16;
else if (g_player[playerNum].inputBits->extbits&(1<<3)) targetang -= 16; else if (g_player[playerNum].input->extbits&(1<<3)) targetang -= 16;
else if (targetang > 0) targetang -= targetang>>2; else if (targetang > 0) targetang -= targetang>>2;
else if (targetang < 0) targetang += (-targetang)>>2; else if (targetang < 0) targetang += (-targetang)>>2;
} }
else else
{ {
if (g_player[playerNum].inputBits->extbits&(1<<2))targetang -= 16; if (g_player[playerNum].input->extbits&(1<<2))targetang -= 16;
else if (g_player[playerNum].inputBits->extbits&(1<<3)) targetang += 16; else if (g_player[playerNum].input->extbits&(1<<3)) targetang += 16;
else if (targetang > 0) targetang -= targetang>>2; else if (targetang > 0) targetang -= targetang>>2;
else if (targetang < 0) targetang += (-targetang)>>2; else if (targetang < 0) targetang += (-targetang)>>2;
} }
@ -3979,7 +3979,7 @@ void G_DoSpriteAnimations(int32_t ourx, int32_t oury, int32_t oura, int32_t smoo
spritesortcnt++; spritesortcnt++;
} }
if (g_player[playerNum].inputBits->extbits & (1 << 7) && !ud.pause_on && spritesortcnt < maxspritesonscreen) if (g_player[playerNum].input->extbits & (1 << 7) && !ud.pause_on && spritesortcnt < maxspritesonscreen)
{ {
auto const playerTyping = t; auto const playerTyping = t;
@ -5624,7 +5624,7 @@ static void G_Cleanup(void)
for (i=MAXPLAYERS-1; i>=0; i--) for (i=MAXPLAYERS-1; i>=0; i--)
{ {
Xfree(g_player[i].ps); Xfree(g_player[i].ps);
Xfree(g_player[i].inputBits); Xfree(g_player[i].input);
} }
for (i=MAXSOUNDS-1; i>=0; i--) for (i=MAXSOUNDS-1; i>=0; i--)
@ -6160,8 +6160,8 @@ void G_MaybeAllocPlayer(int32_t pnum)
{ {
if (g_player[pnum].ps == NULL) if (g_player[pnum].ps == NULL)
g_player[pnum].ps = (DukePlayer_t *)Xcalloc(1, sizeof(DukePlayer_t)); g_player[pnum].ps = (DukePlayer_t *)Xcalloc(1, sizeof(DukePlayer_t));
if (g_player[pnum].inputBits == NULL) if (g_player[pnum].input == NULL)
g_player[pnum].inputBits = (input_t *)Xcalloc(1, sizeof(input_t)); g_player[pnum].input = (input_t *)Xcalloc(1, sizeof(input_t));
#ifdef LUNATIC #ifdef LUNATIC
g_player_ps[pnum] = g_player[pnum].ps; g_player_ps[pnum] = g_player[pnum].ps;
@ -6978,7 +6978,7 @@ int G_DoMoveThings(void)
randomseed = ticrandomseed; randomseed = ticrandomseed;
for (bssize_t TRAVERSE_CONNECT(i)) for (bssize_t TRAVERSE_CONNECT(i))
Bmemcpy(g_player[i].inputBits, &inputfifo[(g_netServer && myconnectindex == i)][i], sizeof(input_t)); Bmemcpy(g_player[i].input, &inputfifo[(g_netServer && myconnectindex == i)][i], sizeof(input_t));
G_UpdateInterpolations(); G_UpdateInterpolations();

4
source/duke3d/src/gameexec.cpp
View file

@ -2915,7 +2915,7 @@ badindex:
dispatch(); dispatch();
vInstruction(CON_IFHITSPACE): vInstruction(CON_IFHITSPACE):
VM_CONDITIONAL(TEST_SYNC_KEY(g_player[vm.playerNum].inputBits->bits, SK_OPEN)); VM_CONDITIONAL(TEST_SYNC_KEY(g_player[vm.playerNum].input->bits, SK_OPEN));
dispatch(); dispatch();
vInstruction(CON_IFHITWEAPON): vInstruction(CON_IFHITWEAPON):
@ -4872,7 +4872,7 @@ badindex:
int const moveFlags = *(++insptr); int const moveFlags = *(++insptr);
int nResult = 0; int nResult = 0;
int const playerXVel = sprite[vm.pPlayer->i].xvel; int const playerXVel = sprite[vm.pPlayer->i].xvel;
int const syncBits = g_player[vm.playerNum].inputBits->bits; int const syncBits = g_player[vm.playerNum].input->bits;
if (((moveFlags & pducking) && vm.pPlayer->on_ground && TEST_SYNC_KEY(syncBits, SK_CROUCH)) if (((moveFlags & pducking) && vm.pPlayer->on_ground && TEST_SYNC_KEY(syncBits, SK_CROUCH))
|| ((moveFlags & pfalling) && vm.pPlayer->jumping_counter == 0 && !vm.pPlayer->on_ground && vm.pPlayer->vel.z > 2048) || ((moveFlags & pfalling) && vm.pPlayer->jumping_counter == 0 && !vm.pPlayer->on_ground && vm.pPlayer->vel.z > 2048)

4
source/duke3d/src/gamestructures.cpp
View file

@ -1773,7 +1773,7 @@ int32_t __fastcall VM_GetPlayerInput(int const playerNum, int32_t labelNum)
return -1; return -1;
} }
auto const &i = g_player[playerNum].inputBits; auto const &i = g_player[playerNum].input;
switch (labelNum) switch (labelNum)
{ {
@ -1804,7 +1804,7 @@ void __fastcall VM_SetPlayerInput(int const playerNum, int const labelNum, int32
return; return;
} }
auto &i = g_player[playerNum].inputBits; auto &i = g_player[playerNum].input;
switch (labelNum) switch (labelNum)
{ {

4
source/duke3d/src/network.cpp
View file

@ -2398,9 +2398,9 @@ static void Net_ReceiveNewPlayer(uint8_t *pbuf, int32_t packbufleng)
{ {
g_player[pbuf[4]].ps = (DukePlayer_t *)Xcalloc(1, sizeof(DukePlayer_t)); g_player[pbuf[4]].ps = (DukePlayer_t *)Xcalloc(1, sizeof(DukePlayer_t));
} }
if (!g_player[pbuf[4]].inputBits) if (!g_player[pbuf[4]].input)
{ {
g_player[pbuf[4]].inputBits = (input_t *)Xcalloc(1, sizeof(input_t)); g_player[pbuf[4]].input = (input_t *)Xcalloc(1, sizeof(input_t));
} }
} }

46
source/duke3d/src/player.cpp
View file

@ -1668,7 +1668,7 @@ static void P_DisplaySpit(void)
{ {
int const rotAng = klabs(sintable[((loogCounter + i) << 5) & 2047]) >> 5; int const rotAng = klabs(sintable[((loogCounter + i) << 5) & 2047]) >> 5;
int const rotZoom = 4096 + ((loogCounter + i) << 9); int const rotZoom = 4096 + ((loogCounter + i) << 9);
int const rotX = (-fix16_to_int(g_player[screenpeek].inputBits->q16avel) >> 1) + (sintable[((loogCounter + i) << 6) & 2047] >> 10); int const rotX = (-fix16_to_int(g_player[screenpeek].input->q16avel) >> 1) + (sintable[((loogCounter + i) << 6) & 2047] >> 10);
rotatesprite_fs((pPlayer->loogiex[i] + rotX) << 16, (200 + pPlayer->loogiey[i] - rotY) << 16, rotZoom - (i << 8), rotatesprite_fs((pPlayer->loogiex[i] + rotX) << 16, (200 + pPlayer->loogiey[i] - rotY) << 16, rotZoom - (i << 8),
256 - rotAng, LOOGIE, 0, 0, 2); 256 - rotAng, LOOGIE, 0, 0, 2);
@ -1734,7 +1734,7 @@ static int P_DisplayFist(int const fistShade)
wx[(g_snum==0)] = (wx[0]+wx[1])/2+1; wx[(g_snum==0)] = (wx[0]+wx[1])/2+1;
#endif #endif
rotatesprite((-fistInc + 222 + (fix16_to_int(g_player[screenpeek].inputBits->q16avel) >> 5)) << 16, (fistY + fistYOffset) << 16, rotatesprite((-fistInc + 222 + (fix16_to_int(g_player[screenpeek].input->q16avel) >> 5)) << 16, (fistY + fistYOffset) << 16,
fistZoom, 0, FIST, fistShade, fistPal, 2, wx[0], windowxy1.y, wx[1], windowxy2.y); fistZoom, 0, FIST, fistShade, fistPal, 2, wx[0], windowxy1.y, wx[1], windowxy2.y);
return 1; return 1;
@ -1884,7 +1884,7 @@ static int P_DisplayKnee(int kneeShade)
int const kneeY = knee_y[ps->knee_incs] + (klabs(ps->look_ang) / 9) - (ps->hard_landing << 3); int const kneeY = knee_y[ps->knee_incs] + (klabs(ps->look_ang) / 9) - (ps->hard_landing << 3);
int const kneePal = P_GetKneePal(ps); int const kneePal = P_GetKneePal(ps);
G_DrawTileScaled(105+(fix16_to_int(g_player[screenpeek].inputBits->q16avel)>>5)-(ps->look_ang>>1)+(knee_y[ps->knee_incs]>>2), G_DrawTileScaled(105+(fix16_to_int(g_player[screenpeek].input->q16avel)>>5)-(ps->look_ang>>1)+(knee_y[ps->knee_incs]>>2),
kneeY+280-(fix16_to_int(ps->q16horiz-ps->q16horizoff)>>4),KNEE,kneeShade,4+DRAWEAP_CENTER,kneePal); kneeY+280-(fix16_to_int(ps->q16horiz-ps->q16horizoff)>>4),KNEE,kneeShade,4+DRAWEAP_CENTER,kneePal);
return 1; return 1;
@ -1914,7 +1914,7 @@ static int P_DisplayKnuckles(int knuckleShade)
int const knuckleY = (klabs(pPlayer->look_ang) / 9) - (pPlayer->hard_landing << 3); int const knuckleY = (klabs(pPlayer->look_ang) / 9) - (pPlayer->hard_landing << 3);
int const knucklePal = P_GetHudPal(pPlayer); int const knucklePal = P_GetHudPal(pPlayer);
G_DrawTileScaled(160 + (fix16_to_int(g_player[screenpeek].inputBits->q16avel) >> 5) - (pPlayer->look_ang >> 1), G_DrawTileScaled(160 + (fix16_to_int(g_player[screenpeek].input->q16avel) >> 5) - (pPlayer->look_ang >> 1),
knuckleY + 180 - (fix16_to_int(pPlayer->q16horiz - pPlayer->q16horizoff) >> 4), knuckleY + 180 - (fix16_to_int(pPlayer->q16horiz - pPlayer->q16horizoff) >> 4),
CRACKKNUCKLES + knuckleFrames[pPlayer->knuckle_incs >> 1], knuckleShade, 4 + DRAWEAP_CENTER, CRACKKNUCKLES + knuckleFrames[pPlayer->knuckle_incs >> 1], knuckleShade, 4 + DRAWEAP_CENTER,
knucklePal); knucklePal);
@ -2083,7 +2083,7 @@ static int P_DisplayTip(int tipShade)
guniqhudid = 201; guniqhudid = 201;
G_DrawTileScaled(170 + (fix16_to_int(g_player[screenpeek].inputBits->q16avel) >> 5) - (pPlayer->look_ang >> 1), G_DrawTileScaled(170 + (fix16_to_int(g_player[screenpeek].input->q16avel) >> 5) - (pPlayer->look_ang >> 1),
tipYOffset + tipY + 240 - (fix16_to_int(pPlayer->q16horiz - pPlayer->q16horizoff) >> 4), tipYOffset + tipY + 240 - (fix16_to_int(pPlayer->q16horiz - pPlayer->q16horizoff) >> 4),
TIP + ((26 - pPlayer->tipincs) >> 4), tipShade, DRAWEAP_CENTER, tipPal); TIP + ((26 - pPlayer->tipincs) >> 4), tipShade, DRAWEAP_CENTER, tipPal);
@ -2116,13 +2116,13 @@ static int P_DisplayAccess(int accessShade)
if ((pSprite->access_incs - 3) > 0 && (pSprite->access_incs - 3) >> 3) if ((pSprite->access_incs - 3) > 0 && (pSprite->access_incs - 3) >> 3)
{ {
G_DrawTileScaled(170 + (fix16_to_int(g_player[screenpeek].inputBits->q16avel) >> 5) - (pSprite->look_ang >> 1) + accessX, G_DrawTileScaled(170 + (fix16_to_int(g_player[screenpeek].input->q16avel) >> 5) - (pSprite->look_ang >> 1) + accessX,
accessY + 266 - (fix16_to_int(pSprite->q16horiz - pSprite->q16horizoff) >> 4), accessY + 266 - (fix16_to_int(pSprite->q16horiz - pSprite->q16horizoff) >> 4),
HANDHOLDINGLASER + (pSprite->access_incs >> 3), accessShade, DRAWEAP_CENTER, accessPal); HANDHOLDINGLASER + (pSprite->access_incs >> 3), accessShade, DRAWEAP_CENTER, accessPal);
} }
else else
{ {
G_DrawTileScaled(170 + (fix16_to_int(g_player[screenpeek].inputBits->q16avel) >> 5) - (pSprite->look_ang >> 1) + accessX, G_DrawTileScaled(170 + (fix16_to_int(g_player[screenpeek].input->q16avel) >> 5) - (pSprite->look_ang >> 1) + accessX,
accessY + 266 - (fix16_to_int(pSprite->q16horiz - pSprite->q16horizoff) >> 4), HANDHOLDINGACCESS, accessShade, accessY + 266 - (fix16_to_int(pSprite->q16horiz - pSprite->q16horizoff) >> 4), HANDHOLDINGACCESS, accessShade,
4 + DRAWEAP_CENTER, accessPal); 4 + DRAWEAP_CENTER, accessPal);
} }
@ -3309,7 +3309,7 @@ access_incs:
A_PlaySound(DUKE_CRACK_FIRST,pPlayer->i); A_PlaySound(DUKE_CRACK_FIRST,pPlayer->i);
} }
} }
else if (pPlayer->knuckle_incs == 22 || TEST_SYNC_KEY(g_player[playerNum].inputBits->bits, SK_FIRE)) else if (pPlayer->knuckle_incs == 22 || TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_FIRE))
pPlayer->knuckle_incs=0; pPlayer->knuckle_incs=0;
return 1; return 1;
@ -3821,7 +3821,7 @@ static void P_ProcessWeapon(int playerNum)
DukePlayer_t *const pPlayer = g_player[playerNum].ps; DukePlayer_t *const pPlayer = g_player[playerNum].ps;
uint8_t *const weaponFrame = &pPlayer->kickback_pic; uint8_t *const weaponFrame = &pPlayer->kickback_pic;
int const playerShrunk = (sprite[pPlayer->i].yrepeat < 32); int const playerShrunk = (sprite[pPlayer->i].yrepeat < 32);
uint32_t playerBits = g_player[playerNum].inputBits->bits; uint32_t playerBits = g_player[playerNum].input->bits;
switch (pPlayer->weapon_pos) switch (pPlayer->weapon_pos)
{ {
@ -3940,7 +3940,7 @@ static void P_ProcessWeapon(int playerNum)
} }
bool const doFire = (playerBits & BIT(SK_FIRE) && (*weaponFrame) == 0); bool const doFire = (playerBits & BIT(SK_FIRE) && (*weaponFrame) == 0);
bool const doAltFire = g_player[playerNum].inputBits->extbits & (1 << 6); bool const doAltFire = g_player[playerNum].input->extbits & (1 << 6);
if (doAltFire) if (doAltFire)
{ {
@ -4675,7 +4675,7 @@ void P_ProcessInput(int playerNum)
VM_OnEvent(EVENT_PROCESSINPUT, pPlayer->i, playerNum); VM_OnEvent(EVENT_PROCESSINPUT, pPlayer->i, playerNum);
uint32_t playerBits = g_player[playerNum].inputBits->bits; uint32_t playerBits = g_player[playerNum].input->bits;
if (pPlayer->cheat_phase > 0) if (pPlayer->cheat_phase > 0)
playerBits = 0; playerBits = 0;
@ -5212,9 +5212,9 @@ void P_ProcessInput(int playerNum)
pPlayer->vel.x = 0; pPlayer->vel.x = 0;
pPlayer->vel.y = 0; pPlayer->vel.y = 0;
} }
else if (g_player[playerNum].inputBits->q16avel) //p->ang += syncangvel * constant else if (g_player[playerNum].input->q16avel) //p->ang += syncangvel * constant
{ {
fix16_t const inputAng = g_player[playerNum].inputBits->q16avel; fix16_t const inputAng = g_player[playerNum].input->q16avel;
pPlayer->q16angvel = (sectorLotag == ST_2_UNDERWATER) ? fix16_mul(inputAng - (inputAng >> 3), fix16_from_int(ksgn(velocityModifier))) pPlayer->q16angvel = (sectorLotag == ST_2_UNDERWATER) ? fix16_mul(inputAng - (inputAng >> 3), fix16_from_int(ksgn(velocityModifier)))
: fix16_mul(inputAng, fix16_from_int(ksgn(velocityModifier))); : fix16_mul(inputAng, fix16_from_int(ksgn(velocityModifier)));
@ -5258,18 +5258,18 @@ void P_ProcessInput(int playerNum)
} }
} }
if (g_player[playerNum].inputBits->extbits & (1)) VM_OnEvent(EVENT_MOVEFORWARD, pPlayer->i, playerNum); if (g_player[playerNum].input->extbits & (1)) VM_OnEvent(EVENT_MOVEFORWARD, pPlayer->i, playerNum);
if (g_player[playerNum].inputBits->extbits & (1 << 1)) VM_OnEvent(EVENT_MOVEBACKWARD, pPlayer->i, playerNum); if (g_player[playerNum].input->extbits & (1 << 1)) VM_OnEvent(EVENT_MOVEBACKWARD, pPlayer->i, playerNum);
if (g_player[playerNum].inputBits->extbits & (1 << 2)) VM_OnEvent(EVENT_STRAFELEFT, pPlayer->i, playerNum); if (g_player[playerNum].input->extbits & (1 << 2)) VM_OnEvent(EVENT_STRAFELEFT, pPlayer->i, playerNum);
if (g_player[playerNum].inputBits->extbits & (1 << 3)) VM_OnEvent(EVENT_STRAFERIGHT, pPlayer->i, playerNum); if (g_player[playerNum].input->extbits & (1 << 3)) VM_OnEvent(EVENT_STRAFERIGHT, pPlayer->i, playerNum);
if (g_player[playerNum].inputBits->extbits & (1 << 4) || g_player[playerNum].inputBits->q16avel < 0) if (g_player[playerNum].input->extbits & (1 << 4) || g_player[playerNum].input->q16avel < 0)
VM_OnEvent(EVENT_TURNLEFT, pPlayer->i, playerNum); VM_OnEvent(EVENT_TURNLEFT, pPlayer->i, playerNum);
if (g_player[playerNum].inputBits->extbits & (1 << 5) || g_player[playerNum].inputBits->q16avel > 0) if (g_player[playerNum].input->extbits & (1 << 5) || g_player[playerNum].input->q16avel > 0)
VM_OnEvent(EVENT_TURNRIGHT, pPlayer->i, playerNum); VM_OnEvent(EVENT_TURNRIGHT, pPlayer->i, playerNum);
if (pPlayer->vel.x || pPlayer->vel.y || g_player[playerNum].inputBits->fvel || g_player[playerNum].inputBits->svel) if (pPlayer->vel.x || pPlayer->vel.y || g_player[playerNum].input->fvel || g_player[playerNum].input->svel)
{ {
pPlayer->crack_time = PCRACKTIME; pPlayer->crack_time = PCRACKTIME;
@ -5323,8 +5323,8 @@ void P_ProcessInput(int playerNum)
} }
#endif #endif
pPlayer->vel.x += (((g_player[playerNum].inputBits->fvel) * velocityModifier) << 6); pPlayer->vel.x += (((g_player[playerNum].input->fvel) * velocityModifier) << 6);
pPlayer->vel.y += (((g_player[playerNum].inputBits->svel) * velocityModifier) << 6); pPlayer->vel.y += (((g_player[playerNum].input->svel) * velocityModifier) << 6);
int playerSpeedReduction = 0; int playerSpeedReduction = 0;
@ -5480,7 +5480,7 @@ HORIZONLY:;
// A horiz diff of 128 equal 45 degrees, // A horiz diff of 128 equal 45 degrees,
// so we convert horiz to 1024 angle units // so we convert horiz to 1024 angle units
float horizAngle = atan2f(pPlayer->q16horiz - F16(100), F16(128)) * (512.f / fPI) + fix16_to_float(g_player[playerNum].inputBits->q16horz); float horizAngle = atan2f(pPlayer->q16horiz - F16(100), F16(128)) * (512.f / fPI) + fix16_to_float(g_player[playerNum].input->q16horz);
if (TEST_SYNC_KEY(playerBits, SK_LOOK_UP)) if (TEST_SYNC_KEY(playerBits, SK_LOOK_UP))
{ {

2
source/duke3d/src/player.h
View file

@ -230,7 +230,7 @@ typedef struct {
// KEEPINSYNC lunatic/_defs_game.lua // KEEPINSYNC lunatic/_defs_game.lua
typedef struct { typedef struct {
DukePlayer_t *ps; DukePlayer_t *ps;
input_t *inputBits; input_t *input;
int32_t netsynctime; int32_t netsynctime;
int16_t ping, filler; int16_t ping, filler;

4
source/duke3d/src/premap.cpp
View file

@ -1682,8 +1682,8 @@ void G_ClearFIFO(void)
for (int p = 0; p < MAXPLAYERS; ++p) for (int p = 0; p < MAXPLAYERS; ++p)
{ {
if (g_player[p].inputBits != NULL) if (g_player[p].input != NULL)
Bmemset(g_player[p].inputBits, 0, sizeof(input_t)); Bmemset(g_player[p].input, 0, sizeof(input_t));
g_player[p].vote = g_player[p].gotvote = 0; g_player[p].vote = g_player[p].gotvote = 0;
} }
} }

16
source/duke3d/src/sector.cpp
View file

@ -2444,7 +2444,7 @@ void P_HandleSharedKeys(int playerNum)
if (pPlayer->cheat_phase == 1) return; if (pPlayer->cheat_phase == 1) return;
uint32_t playerBits = g_player[playerNum].inputBits->bits, weaponNum; uint32_t playerBits = g_player[playerNum].input->bits, weaponNum;
// 1<<0 = jump // 1<<0 = jump
// 1<<1 = crouch // 1<<1 = crouch
@ -3043,25 +3043,25 @@ void P_CheckSectors(int playerNum)
if (pPlayer->gm &MODE_TYPE || sprite[pPlayer->i].extra <= 0) if (pPlayer->gm &MODE_TYPE || sprite[pPlayer->i].extra <= 0)
return; return;
if (TEST_SYNC_KEY(g_player[playerNum].inputBits->bits, SK_OPEN)) if (TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_OPEN))
{ {
if (VM_OnEvent(EVENT_USE, pPlayer->i, playerNum) != 0) if (VM_OnEvent(EVENT_USE, pPlayer->i, playerNum) != 0)
g_player[playerNum].inputBits->bits &= ~BIT(SK_OPEN); g_player[playerNum].input->bits &= ~BIT(SK_OPEN);
} }
if (ud.cashman && TEST_SYNC_KEY(g_player[playerNum].inputBits->bits, SK_OPEN)) if (ud.cashman && TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_OPEN))
A_SpawnMultiple(pPlayer->i, MONEY, 2); A_SpawnMultiple(pPlayer->i, MONEY, 2);
if (pPlayer->newowner >= 0) if (pPlayer->newowner >= 0)
{ {
if (klabs(g_player[playerNum].inputBits->svel) > 768 || klabs(g_player[playerNum].inputBits->fvel) > 768) if (klabs(g_player[playerNum].input->svel) > 768 || klabs(g_player[playerNum].input->fvel) > 768)
{ {
G_ClearCameras(pPlayer); G_ClearCameras(pPlayer);
return; return;
} }
} }
if (!TEST_SYNC_KEY(g_player[playerNum].inputBits->bits, SK_OPEN) && !TEST_SYNC_KEY(g_player[playerNum].inputBits->bits, SK_ESCAPE)) if (!TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_OPEN) && !TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_ESCAPE))
pPlayer->toggle_key_flag = 0; pPlayer->toggle_key_flag = 0;
else if (!pPlayer->toggle_key_flag) else if (!pPlayer->toggle_key_flag)
{ {
@ -3070,7 +3070,7 @@ void P_CheckSectors(int playerNum)
int16_t nearSector, nearWall, nearSprite; int16_t nearSector, nearWall, nearSprite;
int32_t nearDist; int32_t nearDist;
if (TEST_SYNC_KEY(g_player[playerNum].inputBits->bits, SK_ESCAPE)) if (TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_ESCAPE))
{ {
if (pPlayer->newowner >= 0) if (pPlayer->newowner >= 0)
G_ClearCameras(pPlayer); G_ClearCameras(pPlayer);
@ -3275,7 +3275,7 @@ void P_CheckSectors(int playerNum)
} // switch } // switch
} }
if (TEST_SYNC_KEY(g_player[playerNum].inputBits->bits, SK_OPEN) == 0) if (TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_OPEN) == 0)
return; return;
if (pPlayer->newowner >= 0) if (pPlayer->newowner >= 0)