zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 20:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove old PlayerAngles backup/restore methods.

Browse source
This commit is contained in:
Mitchell Richters 2022-11-29 21:12:36 +11:00 committed by Christoph Oelckers
parent 630c10856e
commit bef4536c1f
11 changed files with 18 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/core/coreactor.h
View file

@ -146,6 +146,17 @@ public:
viewzoffset = oviewzoffset;
}
void restoreang()
{
spr.Angles = PrevAngles;
}
void restoreloc()
{
restorepos();
restoreang();
}
double getOffsetZ()
{
return spr.pos.Z + viewzoffset;

22
source/core/gameinput.h
View file

@ -94,33 +94,11 @@ struct PlayerAngles
// Legacy, to be removed.
DAngle ZzHORIZOFF, ZzOHORIZOFF;
void backupPitch()
{
ZzOLDHORIZON() = ZzHORIZON();
ZzOHORIZOFF = ZzHORIZOFF;
}
void restorePitch()
{
ZzHORIZON() = ZzOLDHORIZON();
ZzHORIZOFF = ZzOHORIZOFF;
}
DAngle horizOLDSUM() { return ZzOLDHORIZON() + ZzOHORIZOFF; }
DAngle horizSUM() { return ZzHORIZON() + ZzHORIZOFF; }
DAngle horizLERPSUM(double const interpfrac) { return interpolatedvalue(horizOLDSUM(), horizSUM(), interpfrac); }
DAngle ZzLOOKANG, ZzOLDLOOKANG, ZzROTSCRNANG, ZzOLDROTSCRNANG, YawSpin;
void backupYaw()
{
ZzOLDANGLE() = ZzANGLE();
ZzOLDLOOKANG = ZzLOOKANG;
ZzOLDROTSCRNANG = ZzROTSCRNANG;
}
void restoreYaw()
{
ZzANGLE() = ZzOLDANGLE();
ZzLOOKANG = ZzOLDLOOKANG;
ZzROTSCRNANG = ZzOLDROTSCRNANG;
}
DAngle angOLDSUM() { return ZzOLDANGLE() + ZzOLDLOOKANG; }
DAngle angSUM() { return ZzANGLE() + ZzLOOKANG; }
DAngle angLERPSUM(double const interpfrac) { return interpolatedvalue(angOLDSUM(), angSUM(), interpfrac); }

3
source/games/duke/src/actors.cpp
View file

@ -203,8 +203,7 @@ void checkavailweapon(player_struct* player)
void clearcamera(player_struct* ps)
{
ps->newOwner = nullptr;
ps->GetActor()->restorepos();
ps->Angles.restoreYaw();
ps->GetActor()->restoreloc();
updatesector(ps->GetActor()->getPosWithOffsetZ(), &ps->cursector);
DukeStatIterator it(STAT_ACTOR);

3
source/games/duke/src/actors_d.cpp
View file

@ -1730,8 +1730,7 @@ static void greenslime(DDukeActor *actor)
if (ps[p].newOwner != nullptr)
{
ps[p].newOwner = nullptr;
ps[p].GetActor()->restorepos();
ps[p].Angles.restoreYaw();
ps[p].GetActor()->restoreloc();
updatesector(ps[p].GetActor()->getPosWithOffsetZ(), &ps[p].cursector);

3
source/games/duke/src/gameexec.cpp
View file

@ -2045,8 +2045,7 @@ int ParseState::parse(void)
if(!isRR() && ps[g_p].newOwner != nullptr)
{
ps[g_p].newOwner = nullptr;
ps[g_p].GetActor()->restorepos();
ps[g_p].Angles.restoreYaw();
ps[g_p].GetActor()->restoreloc();
updatesector(ps[g_p].GetActor()->getPosWithOffsetZ(), &ps[g_p].cursector);
DukeStatIterator it(STAT_ACTOR);

10
source/games/duke/src/player.cpp
View file

@ -543,13 +543,6 @@ void footprints(int snum)
//
//---------------------------------------------------------------------------
inline void backupplayer(player_struct* p)
{
p->backuppos();
p->Angles.backupYaw();
p->Angles.backupPitch();
}
void playerisdead(int snum, int psectlotag, double floorz, double ceilingz)
{
auto p = &ps[snum];
@ -620,7 +613,7 @@ void playerisdead(int snum, int psectlotag, double floorz, double ceilingz)
clipmove(p->GetActor()->spr.pos.XY(), p->GetActor()->getOffsetZ(), &p->cursector, DVector2( 0, 0), 10.25, 4., 4., CLIPMASK0, coll);
}
backupplayer(p);
actor->backuploc();
p->Angles.ZzHORIZOFF = p->Angles.ZzHORIZON() = nullAngle;
@ -865,7 +858,6 @@ void checklook(int snum, ESyncBits actions)
actions &= ~SB_LOOK_RIGHT;
}
}
p->Angles.backupYaw();
}
//---------------------------------------------------------------------------

1
source/games/duke/src/player_d.cpp
View file

@ -2762,7 +2762,6 @@ void processinput_d(int snum)
if (SyncInput())
{
p->Angles.backupPitch();
doslopetilting(p);
}

1
source/games/duke/src/player_r.cpp
View file

@ -3348,7 +3348,6 @@ void processinput_r(int snum)
if (SyncInput())
{
p->Angles.backupPitch();
doslopetilting(p);
}

3
source/games/duke/src/sectors_d.cpp
View file

@ -1061,8 +1061,7 @@ void checkhitdefault_d(DDukeActor* targ, DDukeActor* proj)
if (ps[p].newOwner != nullptr)
{
ps[p].newOwner = nullptr;
ps[p].GetActor()->restorepos();
ps[p].Angles.restoreYaw();
ps[p].GetActor()->restoreloc();
updatesector(ps[p].GetActor()->getPosWithOffsetZ(), &ps[p].cursector);

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

@ -904,8 +904,6 @@ void AIPlayer::Tick(RunListEvent* ev)
int nAction = PlayerList[nPlayer].nAction;
int nActionB = PlayerList[nPlayer].nAction;
PlayerList[nPlayer].Angles.backupYaw();
PlayerList[nPlayer].Angles.backupPitch();
PlayerList[nPlayer].Angles.resetAdjustments();
pPlayerActor->vel.XY() = sPlayerInput[nPlayer].vel;

6
source/games/sw/src/player.cpp
View file

@ -2176,7 +2176,7 @@ void DoPlayerMove(PLAYER* pp)
if (interpolate_ride)
{
pp->actor->backupz();
pp->Angles.backupYaw();
pp->actor->backupang();
}
// check for warp - probably can remove from CeilingHit
@ -6677,10 +6677,8 @@ void MoveSkipSavePos(void)
{
pp = Player + pnum;
pp->actor->backuppos();
pp->actor->backuploc();
pp->obob_z = pp->bob_z;
pp->Angles.backupYaw();
pp->Angles.backupPitch();
pp->opbob_amt = pp->pbob_amt;
}