mirror of
https://github.com/ZDoom/Raze.git
synced 2025-05-30 17:01:03 +00:00
SW: Rename q16avel -> q16angvel and q16horz -> q16aimvel.
While it is understandable that avel and horz came from Duke3D, having both q16horiz and q16horz in the updated SW_PACKET struct can be confusing, and the alternative notation is more consistent with the original struct field names of angvel and aimvel, as well as the differing uses of the name angvel still present in player.cpp.
This commit is contained in:
NY00123
Christoph Oelckers
parent
952c578957
commit
eaefc2576c
6 changed files with 81 additions and 81 deletions
|
|
@ -1538,7 +1538,7 @@ DoPlayerCrawlHeight(PLAYERp pp)
|
|||
double scaleAdjustmentToInterval(double x);
|
||||
|
||||
void
|
||||
DoPlayerTurn(PLAYERp pp, fix16_t *pq16ang, fix16_t q16avel)
|
||||
DoPlayerTurn(PLAYERp pp, fix16_t *pq16ang, fix16_t q16angvel)
|
||||
{
|
||||
#define TURN_SHIFT 2
|
||||
|
||||
|
|
@ -1617,14 +1617,14 @@ DoPlayerTurn(PLAYERp pp, fix16_t *pq16ang, fix16_t q16avel)
|
|||
return;
|
||||
}
|
||||
|
||||
q16avel = fix16_smul(q16avel, fix16_from_int(PLAYER_TURN_SCALE));
|
||||
q16angvel = fix16_smul(q16angvel, fix16_from_int(PLAYER_TURN_SCALE));
|
||||
|
||||
if (q16avel != 0)
|
||||
if (q16angvel != 0)
|
||||
{
|
||||
// running is not handled here now
|
||||
q16avel += fix16_sdiv(q16avel, fix16_from_int(4));
|
||||
q16angvel += fix16_sdiv(q16angvel, fix16_from_int(4));
|
||||
|
||||
*pq16ang += fix16_sdiv(fix16_mul(q16avel, fix16_from_int(synctics)), fix16_from_int(32));
|
||||
*pq16ang += fix16_sdiv(fix16_mul(q16angvel, fix16_from_int(synctics)), fix16_from_int(32));
|
||||
*pq16ang = NORM_Q16ANGLE(*pq16ang);
|
||||
if (PEDANTIC_MODE)
|
||||
*pq16ang = fix16_floor(*pq16ang);
|
||||
|
|
@ -1656,7 +1656,7 @@ DoPlayerTurnBoat(PLAYERp pp)
|
|||
if (sop->drive_angspeed)
|
||||
{
|
||||
pp->drive_oangvel = pp->drive_angvel;
|
||||
pp->drive_angvel = mulscale16(fix16_to_int(pp->input.q16avel), sop->drive_angspeed);
|
||||
pp->drive_angvel = mulscale16(fix16_to_int(pp->input.q16angvel), sop->drive_angspeed);
|
||||
|
||||
angslide = sop->drive_angslide;
|
||||
pp->drive_angvel = (pp->drive_angvel + (pp->drive_oangvel*(angslide-1)))/angslide;
|
||||
|
|
@ -1665,7 +1665,7 @@ DoPlayerTurnBoat(PLAYERp pp)
|
|||
}
|
||||
else
|
||||
{
|
||||
angvel = fix16_to_int(pp->input.q16avel) * PLAYER_TURN_SCALE;
|
||||
angvel = fix16_to_int(pp->input.q16angvel) * PLAYER_TURN_SCALE;
|
||||
angvel += angvel - DIV4(angvel);
|
||||
angvel = DIV32(angvel * synctics);
|
||||
}
|
||||
|
|
@ -1688,7 +1688,7 @@ DoPlayerTurnTank(PLAYERp pp, int z, int floor_dist)
|
|||
int angslide;
|
||||
|
||||
pp->drive_oangvel = pp->drive_angvel;
|
||||
pp->drive_angvel = mulscale16(fix16_to_int(pp->input.q16avel), sop->drive_angspeed);
|
||||
pp->drive_angvel = mulscale16(fix16_to_int(pp->input.q16angvel), sop->drive_angspeed);
|
||||
|
||||
angslide = sop->drive_angslide;
|
||||
pp->drive_angvel = (pp->drive_angvel + (pp->drive_oangvel*(angslide-1)))/angslide;
|
||||
|
|
@ -1697,7 +1697,7 @@ DoPlayerTurnTank(PLAYERp pp, int z, int floor_dist)
|
|||
}
|
||||
else
|
||||
{
|
||||
angvel = DIV8(fix16_to_int(pp->input.q16avel) * synctics);
|
||||
angvel = DIV8(fix16_to_int(pp->input.q16angvel) * synctics);
|
||||
}
|
||||
|
||||
if (angvel != 0)
|
||||
|
|
@ -1721,7 +1721,7 @@ DoPlayerTurnTankRect(PLAYERp pp, int *x, int *y, int *ox, int *oy)
|
|||
int angslide;
|
||||
|
||||
pp->drive_oangvel = pp->drive_angvel;
|
||||
pp->drive_angvel = mulscale16(fix16_to_int(pp->input.q16avel), sop->drive_angspeed);
|
||||
pp->drive_angvel = mulscale16(fix16_to_int(pp->input.q16angvel), sop->drive_angspeed);
|
||||
|
||||
angslide = sop->drive_angslide;
|
||||
pp->drive_angvel = (pp->drive_angvel + (pp->drive_oangvel*(angslide-1)))/angslide;
|
||||
|
|
@ -1730,7 +1730,7 @@ DoPlayerTurnTankRect(PLAYERp pp, int *x, int *y, int *ox, int *oy)
|
|||
}
|
||||
else
|
||||
{
|
||||
angvel = DIV8(fix16_to_int(pp->input.q16avel) * synctics);
|
||||
angvel = DIV8(fix16_to_int(pp->input.q16angvel) * synctics);
|
||||
}
|
||||
|
||||
if (angvel != 0)
|
||||
|
|
@ -1759,9 +1759,9 @@ DoPlayerTurnTurret(PLAYERp pp)
|
|||
fifo_ndx = (movefifoplc-2) & (MOVEFIFOSIZ - 1);
|
||||
last_input = pp->inputfifo[fifo_ndx];
|
||||
|
||||
if (pp->input.q16avel && !last_input.q16avel)
|
||||
if (pp->input.q16angvel && !last_input.q16angvel)
|
||||
PlaySOsound(pp->sop->mid_sector, SO_DRIVE_SOUND);
|
||||
else if (!pp->input.q16avel && last_input.q16avel)
|
||||
else if (!pp->input.q16angvel && last_input.q16angvel)
|
||||
PlaySOsound(pp->sop->mid_sector, SO_IDLE_SOUND);
|
||||
}
|
||||
|
||||
|
|
@ -1770,7 +1770,7 @@ DoPlayerTurnTurret(PLAYERp pp)
|
|||
int angslide;
|
||||
|
||||
pp->drive_oangvel = pp->drive_angvel;
|
||||
pp->drive_angvel = mulscale16(fix16_to_int(pp->input.q16avel), sop->drive_angspeed);
|
||||
pp->drive_angvel = mulscale16(fix16_to_int(pp->input.q16angvel), sop->drive_angspeed);
|
||||
|
||||
angslide = sop->drive_angslide;
|
||||
pp->drive_angvel = (pp->drive_angvel + (pp->drive_oangvel*(angslide-1)))/angslide;
|
||||
|
|
@ -1779,7 +1779,7 @@ DoPlayerTurnTurret(PLAYERp pp)
|
|||
}
|
||||
else
|
||||
{
|
||||
angvel = DIV4(fix16_to_int(pp->input.q16avel) * synctics);
|
||||
angvel = DIV4(fix16_to_int(pp->input.q16angvel) * synctics);
|
||||
}
|
||||
|
||||
if (angvel != 0)
|
||||
|
|
@ -1906,7 +1906,7 @@ PlayerAutoLook(PLAYERp pp)
|
|||
|
||||
extern int PlaxCeilGlobZadjust, PlaxFloorGlobZadjust;
|
||||
void
|
||||
DoPlayerHorizon(PLAYERp pp, fix16_t *pq16horiz, fix16_t q16horz)
|
||||
DoPlayerHorizon(PLAYERp pp, fix16_t *pq16horiz, fix16_t q16aimvel)
|
||||
{
|
||||
int i;
|
||||
#define HORIZ_SPEED (16)
|
||||
|
|
@ -1924,9 +1924,9 @@ DoPlayerHorizon(PLAYERp pp, fix16_t *pq16horiz, fix16_t q16horz)
|
|||
if (cl_slopetilting)
|
||||
PlayerAutoLook(pp);
|
||||
|
||||
if (q16horz)
|
||||
if (q16aimvel)
|
||||
{
|
||||
pp->q16horizbase += q16horz;
|
||||
pp->q16horizbase += q16aimvel;
|
||||
SET(pp->Flags, PF_LOCK_HORIZ | PF_LOOKING);
|
||||
}
|
||||
|
||||
|
|
@ -2635,7 +2635,7 @@ DoPlayerMove(PLAYERp pp)
|
|||
|
||||
SlipSlope(pp);
|
||||
|
||||
DoPlayerTurn(pp, &pp->q16ang, pp->input.q16avel);
|
||||
DoPlayerTurn(pp, &pp->q16ang, pp->input.q16angvel);
|
||||
|
||||
pp->oldposx = pp->posx;
|
||||
pp->oldposy = pp->posy;
|
||||
|
|
@ -2739,7 +2739,7 @@ DoPlayerMove(PLAYERp pp)
|
|||
|
||||
DoPlayerSetWadeDepth(pp);
|
||||
|
||||
DoPlayerHorizon(pp, &pp->q16horiz, pp->input.q16horz);
|
||||
DoPlayerHorizon(pp, &pp->q16horiz, pp->input.q16aimvel);
|
||||
|
||||
if (pp->cursectnum >= 0 && TEST(sector[pp->cursectnum].extra, SECTFX_DYNAMIC_AREA))
|
||||
{
|
||||
|
|
@ -2947,7 +2947,7 @@ DoPlayerMoveBoat(PLAYERp pp)
|
|||
OperateSectorObject(pp->sop, fix16_to_int(pp->q16ang), pp->posx, pp->posy);
|
||||
pp->cursectnum = save_sectnum; // for speed
|
||||
|
||||
DoPlayerHorizon(pp, &pp->q16horiz, pp->input.q16horz);
|
||||
DoPlayerHorizon(pp, &pp->q16horiz, pp->input.q16aimvel);
|
||||
}
|
||||
|
||||
#if 0
|
||||
|
|
@ -3117,7 +3117,7 @@ DriveCrush(PLAYERp pp, int *x, int *y)
|
|||
return;
|
||||
|
||||
// not moving - don't crush
|
||||
if ((pp->xvect|pp->yvect) == 0 && pp->input.q16avel == 0)
|
||||
if ((pp->xvect|pp->yvect) == 0 && pp->input.q16angvel == 0)
|
||||
return;
|
||||
|
||||
// main sector
|
||||
|
|
@ -3458,7 +3458,7 @@ DoPlayerMoveTank(PLAYERp pp)
|
|||
OperateSectorObject(pp->sop, fix16_to_int(pp->q16ang), pp->posx, pp->posy);
|
||||
pp->cursectnum = save_sectnum; // for speed
|
||||
|
||||
DoPlayerHorizon(pp, &pp->q16horiz, pp->input.q16horz);
|
||||
DoPlayerHorizon(pp, &pp->q16horiz, pp->input.q16aimvel);
|
||||
|
||||
DoTankTreads(pp);
|
||||
}
|
||||
|
|
@ -3475,7 +3475,7 @@ DoPlayerMoveTurret(PLAYERp pp)
|
|||
|
||||
OperateSectorObject(pp->sop, fix16_to_int(pp->q16ang), pp->sop->xmid, pp->sop->ymid);
|
||||
|
||||
DoPlayerHorizon(pp, &pp->q16horiz, pp->input.q16horz);
|
||||
DoPlayerHorizon(pp, &pp->q16horiz, pp->input.q16aimvel);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -4051,7 +4051,7 @@ DoPlayerClimb(PLAYERp pp)
|
|||
sp->z = pp->posz + PLAYER_HEIGHT;
|
||||
changespritesect(pp->PlayerSprite, pp->cursectnum);
|
||||
|
||||
DoPlayerHorizon(pp, &pp->q16horiz, pp->input.q16horz);
|
||||
DoPlayerHorizon(pp, &pp->q16horiz, pp->input.q16aimvel);
|
||||
|
||||
if (FAF_ConnectArea(pp->cursectnum))
|
||||
{
|
||||
|
|
@ -5922,7 +5922,7 @@ DoPlayerBeginOperate(PLAYERp pp)
|
|||
break;
|
||||
case SO_TURRET_MGUN:
|
||||
case SO_TURRET:
|
||||
if (pp->input.q16avel)
|
||||
if (pp->input.q16angvel)
|
||||
PlaySOsound(pp->sop->mid_sector, SO_DRIVE_SOUND);
|
||||
else
|
||||
PlaySOsound(pp->sop->mid_sector, SO_IDLE_SOUND);
|
||||
|
|
@ -6010,7 +6010,7 @@ DoPlayerBeginRemoteOperate(PLAYERp pp, SECTOR_OBJECTp sop)
|
|||
break;
|
||||
case SO_TURRET_MGUN:
|
||||
case SO_TURRET:
|
||||
if (pp->input.q16avel)
|
||||
if (pp->input.q16angvel)
|
||||
PlaySOsound(pp->sop->mid_sector, SO_DRIVE_SOUND);
|
||||
else
|
||||
PlaySOsound(pp->sop->mid_sector, SO_IDLE_SOUND);
|
||||
|
|
@ -6779,9 +6779,9 @@ void DoPlayerDeathFollowKiller(PLAYERp pp)
|
|||
//DoPlayerDeathTilt(pp, pp->tilt_dest, 4 * synctics);
|
||||
|
||||
// allow turning
|
||||
if ((TEST(pp->Flags, PF_DEAD_HEAD) && pp->input.q16avel != 0) || TEST(pp->Flags, PF_HEAD_CONTROL))
|
||||
if ((TEST(pp->Flags, PF_DEAD_HEAD) && pp->input.q16angvel != 0) || TEST(pp->Flags, PF_HEAD_CONTROL))
|
||||
{
|
||||
DoPlayerTurn(pp, &pp->q16ang, pp->input.q16avel);
|
||||
DoPlayerTurn(pp, &pp->q16ang, pp->input.q16angvel);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -7603,7 +7603,7 @@ void ChopsCheck(PLAYERp pp)
|
|||
|
||||
if (!M_Active() && !HelpInputMode && !TEST(pp->Flags, PF_DEAD) && !pp->sop_riding && numplayers <= 1)
|
||||
{
|
||||
if ((pp->input.bits|pp->input.vel|pp->input.svel|pp->input.q16avel|pp->input.q16horz) ||
|
||||
if ((pp->input.bits|pp->input.vel|pp->input.svel|pp->input.q16angvel|pp->input.q16aimvel) ||
|
||||
TEST(pp->Flags, PF_CLIMBING|PF_FALLING|PF_DIVING))
|
||||
{
|
||||
// Hit a input key or other reason to stop chops
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue