zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-01 09:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Misc tidy-ups.

Browse source 
* The setting of `Player::bIsFiring` needs to be done before setting a new weapon.
* Tidy up some weird reverse engineering `while (1)` loop which GDX doesn't do.
This commit is contained in:
Mitchell Richters 2023-03-28 08:45:14 +11:00
parent 42d791e7c2
commit c6a53265eb
1 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
source/games/exhumed/src/player.cpp
View file

@ -1224,6 +1224,7 @@ static void updatePlayerWeapon(Player* const pPlayer)
return; return;
} }
pPlayer->bIsFiring = bIsFiring;
const auto newWeap = pPlayer->input.getNewWeapon(); const auto newWeap = pPlayer->input.getNewWeapon();
if (const auto weapDir = (newWeap == WeaponSel_Next) - (newWeap == WeaponSel_Prev)) if (const auto weapDir = (newWeap == WeaponSel_Next) - (newWeap == WeaponSel_Prev))
@ -1247,8 +1248,6 @@ static void updatePlayerWeapon(Player* const pPlayer)
{ {
SetNewWeapon(pPlayer->nPlayer, newWeap - 1); SetNewWeapon(pPlayer->nPlayer, newWeap - 1);
} }
pPlayer->bIsFiring = bIsFiring;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -1523,8 +1522,7 @@ static void doPlayerRamses(Player* const pPlayer)
if (nTotalPlayers <= 1) if (nTotalPlayers <= 1)
{ {
const auto pPlayerActor = pPlayer->pActor; pPlayer->pActor->vel.Zero();
pPlayerActor->vel.Zero();
pPlayer->vel.Zero(); pPlayer->vel.Zero();
if (nFreeze < 1) if (nFreeze < 1)
@ -1652,21 +1650,13 @@ static void updatePlayerDoppleActor(Player* const pPlayer)
static void updatePlayerViewSector(Player* const pPlayer, const Collision& nMove, const DVector3& spr_pos, const DVector3& spr_vel, const bool bUnderwater) static void updatePlayerViewSector(Player* const pPlayer, const Collision& nMove, const DVector3& spr_pos, const DVector3& spr_vel, const bool bUnderwater)
{ {
const auto pPlayerActor = pPlayer->pActor; const auto pPlayerActor = pPlayer->pActor;
const double EyeZ = pPlayerActor->getOffsetZ() + pPlayer->nQuake; const auto pPlayerSect = pPlayerActor->sector();
auto pViewSect = pPlayerActor->sector(); const auto bPlayerBelowCeil = (pPlayerActor->getOffsetZ() + pPlayer->nQuake) < pPlayerSect->ceilingz;
const auto pViewSect = bPlayerBelowCeil && pPlayerSect->pAbove ? pPlayerSect->pAbove : pPlayerSect;
while (1)
{
if (EyeZ >= pViewSect->ceilingz || !pViewSect->pAbove)
break;
pViewSect = pViewSect->pAbove;
}
// Do underwater sector check // Do underwater sector check
if (bUnderwater && pViewSect != pPlayerActor->sector() && nMove.type == kHitWall) if (bUnderwater && pViewSect != pPlayerSect && nMove.type == kHitWall)
{ {
const auto sect = pPlayerActor->sector();
const auto pos = pPlayerActor->spr.pos; const auto pos = pPlayerActor->spr.pos;
const auto fz = pViewSect->floorz - 20; const auto fz = pViewSect->floorz - 20;
pPlayerActor->spr.pos = DVector3(spr_pos.XY(), fz); pPlayerActor->spr.pos = DVector3(spr_pos.XY(), fz);
@ -1674,7 +1664,7 @@ static void updatePlayerViewSector(Player* const pPlayer, const Collision& nMove
if (movesprite(pPlayerActor, spr_vel.XY(), 0, 0, CLIPMASK0).type == kHitWall) if (movesprite(pPlayerActor, spr_vel.XY(), 0, 0, CLIPMASK0).type == kHitWall)
{ {
ChangeActorSect(pPlayerActor, sect); ChangeActorSect(pPlayerActor, pPlayerSect);
pPlayerActor->spr.pos = pos; pPlayerActor->spr.pos = pos;
} }
else else