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

- Exhumed: Reorganise RestartPlayer() so player/actor variables are grouped.

Browse source
This commit is contained in:
Mitchell Richters 2023-03-25 20:46:07 +11:00
parent b4028cb250
commit 572869f502
1 changed files with 59 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -191,10 +191,7 @@ void RestartPlayer(int nPlayer)
const auto pPlayer = &PlayerList[nPlayer]; const auto pPlayer = &PlayerList[nPlayer];
DExhumedActor* pPlayerActor = pPlayer->pActor; DExhumedActor* pPlayerActor = pPlayer->pActor;
DExhumedActor* pDopSprite = pPlayer->pDoppleSprite; DExhumedActor* pDopSprite = pPlayer->pDoppleSprite;
DExhumedActor* pFloorSprite = pPlayer->pPlayerFloorSprite;
DExhumedActor* pFloorSprite;
pPlayer->nPlayer = nPlayer;
if (pPlayerActor) if (pPlayerActor)
{ {
@ -206,10 +203,8 @@ void RestartPlayer(int nPlayer)
pPlayer->pActor = nullptr; pPlayer->pActor = nullptr;
pPlayer->Angles = {}; pPlayer->Angles = {};
DExhumedActor* pFloorSprite = pPlayer->pPlayerFloorSprite; if (pFloorSprite)
if (pFloorSprite != nullptr) {
DeleteActor(pFloorSprite); DeleteActor(pFloorSprite);
}
if (pDopSprite) if (pDopSprite)
{ {
@ -220,28 +215,40 @@ void RestartPlayer(int nPlayer)
} }
pPlayerActor = GrabBody(); pPlayerActor = GrabBody();
pPlayerActor->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
pPlayerActor->spr.shade = -12;
pPlayerActor->spr.pal = 0;
pPlayerActor->spr.scale = DVector2(0.625, 0.625);
pPlayerActor->spr.xoffset = 0;
pPlayerActor->spr.yoffset = 0;
pPlayerActor->spr.picnum = seq_GetSeqPicnum(kSeqJoe, 18, 0);
pPlayerActor->spr.hitag = 0;
pPlayerActor->spr.extra = -1;
pPlayerActor->spr.lotag = runlist_HeadRun() + 1;
pPlayerActor->clipdist = 14.5;
pPlayerActor->oviewzoffset = pPlayerActor->viewzoffset = -55.;
pPlayerActor->vel.X = 0;
pPlayerActor->vel.Y = 0;
pPlayerActor->vel.Z = 0;
pPlayerActor->backuploc();
pPlayerActor->spr.intowner = runlist_AddRunRec(pPlayerActor->spr.lotag - 1, nPlayer, 0xA0000);
ChangeActorSect(pPlayerActor, pPlayer->sPlayerSave.pSector); ChangeActorSect(pPlayerActor, pPlayer->sPlayerSave.pSector);
ChangeActorStat(pPlayerActor, 100); ChangeActorStat(pPlayerActor, 100);
pDopSprite = insertActor(pPlayerActor->sector(), 100);
pPlayer->pDoppleSprite = pDopSprite;
if (nTotalPlayers > 1) if (nTotalPlayers > 1)
{ {
DExhumedActor* nNStartSprite = nNetStartSprite[nCurStartSprite]; DExhumedActor* nNStartSprite = nNetStartSprite[nCurStartSprite];
nCurStartSprite++; nCurStartSprite++;
if (nCurStartSprite >= nNetStartSprites) { if (nCurStartSprite >= nNetStartSprites)
nCurStartSprite = 0; nCurStartSprite = 0;
}
pPlayerActor->spr.pos = nNStartSprite->spr.pos; pPlayerActor->spr.pos = nNStartSprite->spr.pos;
ChangeActorSect(pPlayerActor, nNStartSprite->sector());
pPlayerActor->spr.Angles.Yaw = nNStartSprite->spr.Angles.Yaw; pPlayerActor->spr.Angles.Yaw = nNStartSprite->spr.Angles.Yaw;
ChangeActorSect(pPlayerActor, nNStartSprite->sector());
pFloorSprite = insertActor(pPlayerActor->sector(), 0); pFloorSprite = insertActor(pPlayerActor->sector(), 0);
pFloorSprite->spr.pos = pPlayerActor->spr.pos; pFloorSprite->spr.pos = pPlayerActor->spr.pos;
pFloorSprite->spr.scale = DVector2(1, 1); pFloorSprite->spr.scale = DVector2(1, 1);
pFloorSprite->spr.cstat = CSTAT_SPRITE_ALIGNMENT_FLOOR; pFloorSprite->spr.cstat = CSTAT_SPRITE_ALIGNMENT_FLOOR;
@ -252,33 +259,10 @@ void RestartPlayer(int nPlayer)
pPlayerActor->spr.pos.XY() = pPlayer->sPlayerSave.pos.XY(); pPlayerActor->spr.pos.XY() = pPlayer->sPlayerSave.pos.XY();
pPlayerActor->spr.pos.Z = pPlayer->sPlayerSave.pSector->floorz; pPlayerActor->spr.pos.Z = pPlayer->sPlayerSave.pSector->floorz;
pPlayerActor->spr.Angles.Yaw = pPlayer->sPlayerSave.nAngle; pPlayerActor->spr.Angles.Yaw = pPlayer->sPlayerSave.nAngle;
pFloorSprite = nullptr; pFloorSprite = nullptr;
} }
pPlayerActor->backuploc(); pDopSprite = insertActor(pPlayerActor->sector(), 100);
pPlayer->pPlayerFloorSprite = pFloorSprite;
pPlayerActor->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
pPlayerActor->spr.shade = -12;
pPlayerActor->clipdist = 14.5;
pPlayerActor->spr.pal = 0;
pPlayerActor->spr.scale = DVector2(0.625, 0.625);
pPlayerActor->spr.xoffset = 0;
pPlayerActor->spr.yoffset = 0;
pPlayerActor->spr.picnum = seq_GetSeqPicnum(kSeqJoe, 18, 0);
pPlayerActor->vel.X = 0;
pPlayerActor->vel.Y = 0;
pPlayerActor->vel.Z = 0;
nStandHeight = GetActorHeight(pPlayerActor);
pPlayerActor->spr.hitag = 0;
pPlayerActor->spr.extra = -1;
pPlayerActor->spr.lotag = runlist_HeadRun() + 1;
pDopSprite->spr.pos = pPlayerActor->spr.pos; pDopSprite->spr.pos = pPlayerActor->spr.pos;
pDopSprite->spr.scale = pPlayerActor->spr.scale; pDopSprite->spr.scale = pPlayerActor->spr.scale;
pDopSprite->spr.xoffset = 0; pDopSprite->spr.xoffset = 0;
@ -286,52 +270,58 @@ void RestartPlayer(int nPlayer)
pDopSprite->spr.shade = pPlayerActor->spr.shade; pDopSprite->spr.shade = pPlayerActor->spr.shade;
pDopSprite->spr.Angles.Yaw = pPlayerActor->spr.Angles.Yaw; pDopSprite->spr.Angles.Yaw = pPlayerActor->spr.Angles.Yaw;
pDopSprite->spr.cstat = pPlayerActor->spr.cstat; pDopSprite->spr.cstat = pPlayerActor->spr.cstat;
pDopSprite->spr.lotag = runlist_HeadRun() + 1; pDopSprite->spr.lotag = runlist_HeadRun() + 1;
pDopSprite->spr.intowner = runlist_AddRunRec(pDopSprite->spr.lotag - 1, nPlayer, 0xA0000);
pPlayer->nAction = 0; pPlayer->pActor = pPlayerActor;
pPlayer->nHealth = 800; // TODO - define pPlayer->pDoppleSprite = pDopSprite;
pPlayer->pPlayerFloorSprite = pFloorSprite;
if (nNetPlayerCount) { pPlayer->nPlayer = nPlayer;
pPlayer->nHealth = 1600; // TODO - define pPlayer->nAction = 0;
} pPlayer->nHealth = 800; // TODO - define
pPlayer->nSeqSize = 0; pPlayer->nSeqSize = 0;
pPlayer->pActor = pPlayerActor;
pPlayer->Angles = {}; pPlayer->Angles = {};
pPlayer->Angles.initialize(pPlayer->pActor); pPlayer->Angles.initialize(pPlayerActor);
pPlayer->bIsMummified = false; pPlayer->bIsMummified = false;
if (pPlayer->invincibility >= 0) {
pPlayer->invincibility = 0;
}
pPlayer->nTorch = 0; pPlayer->nTorch = 0;
pPlayer->nMaskAmount = 0; pPlayer->nMaskAmount = 0;
SetTorch(nPlayer, 0);
pPlayer->nInvisible = 0; pPlayer->nInvisible = 0;
pPlayer->bIsFiring = 0; pPlayer->bIsFiring = 0;
pPlayer->nSeqSize2 = 0; pPlayer->nSeqSize2 = 0;
pPlayer->pPlayerViewSect = pPlayer->sPlayerSave.pSector; pPlayer->pPlayerViewSect = pPlayer->sPlayerSave.pSector;
pPlayer->nState = 0; pPlayer->nState = 0;
pPlayer->nDouble = 0; pPlayer->nDouble = 0;
pPlayer->nSeq = kSeqJoe; pPlayer->nSeq = kSeqJoe;
pPlayer->nPlayerPushSound = -1; pPlayer->nPlayerPushSound = -1;
pPlayer->nNextWeapon = -1; pPlayer->nNextWeapon = -1;
if (pPlayer->nCurrentWeapon == 7) {
pPlayer->nCurrentWeapon = pPlayer->nLastWeapon;
}
pPlayer->nLastWeapon = 0; pPlayer->nLastWeapon = 0;
pPlayer->nAir = 100; pPlayer->nAir = 100;
pPlayer->pPlayerGrenade = nullptr;
pPlayer->dVertPan = 0;
pPlayer->nThrust.Zero();
pPlayer->nDestVertPan = pPlayerActor->PrevAngles.Pitch = pPlayerActor->spr.Angles.Pitch = nullAngle;
pPlayer->nBreathTimer = 90;
pPlayer->nTauntTimer = RandomSize(3) + 3;
pPlayer->ototalvel = pPlayer->totalvel = 0;
pPlayer->nCurrentItem = -1;
pPlayer->nDeathType = 0;
pPlayer->nQuake = 0;
SetTorch(nPlayer, 0);
if (nNetPlayerCount)
pPlayer->nHealth = 1600; // TODO - define
if (pPlayer->invincibility >= 0)
pPlayer->invincibility = 0;
if (pPlayer->nCurrentWeapon == 7)
pPlayer->nCurrentWeapon = pPlayer->nLastWeapon;
if (nPlayer == nLocalPlayer)
RestoreGreenPal();
if (pPlayer->nRun < 0)
pPlayer->nRun = runlist_AddRunRec(NewRun, nPlayer, 0xA0000);
if (!(currentLevel->gameflags & LEVEL_EX_MULTI)) if (!(currentLevel->gameflags & LEVEL_EX_MULTI))
{ {
@ -343,39 +333,9 @@ void RestartPlayer(int nPlayer)
pPlayer->nMagic = 0; pPlayer->nMagic = 0;
} }
pPlayer->pPlayerGrenade = nullptr;
pPlayerActor->oviewzoffset = pPlayerActor->viewzoffset = -55.;
pPlayer->dVertPan = 0;
nTemperature[nPlayer] = 0; nTemperature[nPlayer] = 0;
pPlayer->nThrust.Zero();
pPlayer->nDestVertPan = pPlayerActor->PrevAngles.Pitch = pPlayerActor->spr.Angles.Pitch = nullAngle;
pPlayer->nBreathTimer = 90;
pPlayer->nTauntTimer = RandomSize(3) + 3;
pDopSprite->spr.intowner = runlist_AddRunRec(pDopSprite->spr.lotag - 1, nPlayer, 0xA0000);
pPlayerActor->spr.intowner = runlist_AddRunRec(pPlayerActor->spr.lotag - 1, nPlayer, 0xA0000);
if (pPlayer->nRun < 0) {
pPlayer->nRun = runlist_AddRunRec(NewRun, nPlayer, 0xA0000);
}
BuildRa(nPlayer); BuildRa(nPlayer);
if (nPlayer == nLocalPlayer)
{
RestoreGreenPal();
}
pPlayer->ototalvel = pPlayer->totalvel = 0;
pPlayer->nCurrentItem = -1;
pPlayer->nDeathType = 0;
pPlayer->nQuake = 0;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -1532,7 +1492,7 @@ static void updatePlayerAction(Player* const pPlayer)
{ {
nextAction = 10 - (pPlayer->totalvel <= 1); nextAction = 10 - (pPlayer->totalvel <= 1);
} }
else if (nStandHeight > (pPlayerSect->floorz - pPlayerSect->ceilingz)) else if (GetActorHeight(pPlayerActor) > (pPlayerSect->floorz - pPlayerSect->ceilingz))
{ {
// CHECKME - confirm branching in this area is OK // CHECKME - confirm branching in this area is OK
// CHECKME - are we finished with 'nSector' variable at this point? if so, maybe set it to pPlayerActor->sector() so we can make this code a bit neater. Don't assume pPlayerActor->sector() == nSector here!! // CHECKME - are we finished with 'nSector' variable at this point? if so, maybe set it to pPlayerActor->sector() so we can make this code a bit neater. Don't assume pPlayerActor->sector() == nSector here!!
@ -1920,7 +1880,6 @@ void SerializePlayer(FSerializer& arc)
if (arc.BeginObject("player")) if (arc.BeginObject("player"))
{ {
arc ("bobangle", bobangle) arc ("bobangle", bobangle)
("standheight", nStandHeight)
("playercount", PlayerCount) ("playercount", PlayerCount)
("netstartsprites", nNetStartSprites) ("netstartsprites", nNetStartSprites)
("localplayer", nLocalPlayer) ("localplayer", nLocalPlayer)