Skip to content

Commit

Permalink
- Rename PlayerAngle::oang in preparation for replacement work.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mjr4077au
mjr4077au committed Nov 26, 2022
1 parent 92d4a71 commit 72de7b2
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion source/core/gameinput.cpp
View file
Expand Up @@ -341,7 +341,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngle& w, Pl

if (arc.isReading())
{
w.oang = w.ZzANGLE;
w.ZzOLDANGLE = w.ZzANGLE;
w.olook_ang = w.look_ang;
w.orotscrnang = w.rotscrnang;
w.inputdisabled = w.inputdisabled;
Expand Down
12 changes: 6 additions & 6 deletions source/core/gameinput.h
View file
Expand Up @@ -99,7 +99,7 @@ struct PlayerHorizon

struct PlayerAngle
{
DAngle ZzANGLE, oang, look_ang, olook_ang, rotscrnang, orotscrnang, spin;
DAngle ZzANGLE, ZzOLDANGLE, look_ang, olook_ang, rotscrnang, orotscrnang, spin;

friend FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngle& w, PlayerAngle* def);

Expand All @@ -109,22 +109,22 @@ struct PlayerAngle
// Interpolation helpers.
void backup()
{
oang = ZzANGLE;
ZzOLDANGLE = ZzANGLE;
olook_ang = look_ang;
orotscrnang = rotscrnang;
}
void restore()
{
ZzANGLE = oang;
ZzANGLE = ZzOLDANGLE;
look_ang = olook_ang;
rotscrnang = orotscrnang;
}

// Commonly used getters.
DAngle osum() { return oang + olook_ang; }
DAngle osum() { return ZzOLDANGLE + olook_ang; }
DAngle sum() { return ZzANGLE + look_ang; }
DAngle interpolatedsum(double const interpfrac) { return interpolatedvalue(osum(), sum(), interpfrac); }
DAngle interpolatedang(double const interpfrac) { return interpolatedvalue(oang, ZzANGLE, interpfrac); }
DAngle interpolatedang(double const interpfrac) { return interpolatedvalue(ZzOLDANGLE, ZzANGLE, interpfrac); }
DAngle interpolatedlookang(double const interpfrac) { return interpolatedvalue(olook_ang, look_ang, interpfrac); }
DAngle interpolatedrotscrn(double const interpfrac) { return interpolatedvalue(orotscrnang, rotscrnang, interpfrac); }
DAngle renderlookang(double const interpfrac) { return !SyncInput() ? look_ang : interpolatedlookang(interpfrac); }
Expand Down Expand Up @@ -178,7 +178,7 @@ struct PlayerAngle
else
{
ZzANGLE = value;
if (backup) oang = ZzANGLE;
if (backup) ZzOLDANGLE = ZzANGLE;
}
}

Expand Down
2 changes: 1 addition & 1 deletion source/games/blood/src/osdcmd.cpp
View file
Expand Up @@ -40,7 +40,7 @@ void GameInterface::WarpToCoords(double x, double y, double z, DAngle ang)

if (ang != DAngle::fromDeg(INT_MIN))
{
pPlayer->angle.oang = pPlayer->angle.ZzANGLE = ang;
pPlayer->angle.ZzOLDANGLE = pPlayer->angle.ZzANGLE = ang;
}
}

Expand Down
2 changes: 1 addition & 1 deletion source/games/duke/src/actors.cpp
View file
Expand Up @@ -401,7 +401,7 @@ void moveplayers(void)
{
act->restorepos();
act->backupz();
act->spr.Angles.Yaw = p->angle.oang;
act->spr.Angles.Yaw = p->angle.ZzOLDANGLE;
SetActor(act, act->spr.pos);
}
else
Expand Down
2 changes: 1 addition & 1 deletion source/games/duke/src/ccmds.cpp
View file
Expand Up @@ -123,7 +123,7 @@ void GameInterface::WarpToCoords(double x, double y, double z, DAngle ang)

if (ang != DAngle::fromDeg(INT_MIN))
{
p->angle.oang = p->angle.ZzANGLE = ang;
p->angle.ZzOLDANGLE = p->angle.ZzANGLE = ang;
}
}

Expand Down
4 changes: 2 additions & 2 deletions source/games/duke/src/game_misc.cpp
View file
Expand Up @@ -274,13 +274,13 @@ void drawoverlays(double interpfrac)
else
{
cposxy = interpolatedvalue(pp->GetActor()->getPrevPosWithOffsetZ(), pp->GetActor()->getPosWithOffsetZ(), interpfrac).XY();
cang = !SyncInput() ? pp->angle.ZzANGLE : interpolatedvalue(pp->angle.oang, pp->angle.ZzANGLE, interpfrac);
cang = !SyncInput() ? pp->angle.ZzANGLE : interpolatedvalue(pp->angle.ZzOLDANGLE, pp->angle.ZzANGLE, interpfrac);
}
}
else
{
cposxy = pp->GetActor()->opos.XY();
cang = pp->angle.oang;
cang = pp->angle.ZzOLDANGLE;
}
DrawOverheadMap(cposxy, cang, interpfrac);
RestoreInterpolations();
Expand Down
2 changes: 1 addition & 1 deletion source/games/duke/src/gameexec.cpp
View file
Expand Up @@ -477,7 +477,7 @@ void DoPlayer(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor,
break;

case PLAYER_OANG:
if (!bSet) SetGameVarID(lVar2, ps[iPlayer].angle.oang.Buildang(), sActor, sPlayer);
if (!bSet) SetGameVarID(lVar2, ps[iPlayer].angle.ZzOLDANGLE.Buildang(), sActor, sPlayer);
break;

case PLAYER_ANGVEL: // This no longer exists.
Expand Down
4 changes: 2 additions & 2 deletions source/games/duke/src/premap.cpp
View file
Expand Up @@ -72,7 +72,7 @@ void pickrandomspot(int snum)
p->GetActor()->spr.pos = po[i].opos;
p->GetActor()->backuppos();
p->setbobpos();
p->angle.oang = p->angle.ZzANGLE = po[i].oa;
p->angle.ZzOLDANGLE = p->angle.ZzANGLE = po[i].oa;
p->setCursector(po[i].os);
}

Expand Down Expand Up @@ -625,7 +625,7 @@ void resetpspritevars(int g, const DVector3& startpos)
act->SetOwner(act);

ps[j].setbobpos();
ps[j].angle.oang = ps[j].angle.ZzANGLE = act->spr.Angles.Yaw; // check me out later.
ps[j].angle.ZzOLDANGLE = ps[j].angle.ZzANGLE = act->spr.Angles.Yaw; // check me out later.

updatesector(act->spr.pos, &ps[j].cursector);

Expand Down
10 changes: 5 additions & 5 deletions source/games/duke/src/sectors_d.cpp
View file
Expand Up @@ -1516,17 +1516,17 @@ void checksectors_d(int snum)
return;
}
if (p->newOwner != nullptr)
neartag(p->GetActor()->getPrevPosWithOffsetZ(), p->GetActor()->sector(), p->angle.oang, near, 80., NT_Lotag);
neartag(p->GetActor()->getPrevPosWithOffsetZ(), p->GetActor()->sector(), p->angle.ZzOLDANGLE, near, 80., NT_Lotag);
else
{
neartag(p->GetActor()->getPosWithOffsetZ(), p->GetActor()->sector(), p->angle.oang, near, 80., NT_Lotag);
neartag(p->GetActor()->getPosWithOffsetZ(), p->GetActor()->sector(), p->angle.ZzOLDANGLE, near, 80., NT_Lotag);
if (near.actor() == nullptr && near.hitWall == nullptr && near.hitSector == nullptr)
neartag(p->GetActor()->getPosWithOffsetZ().plusZ(8), p->GetActor()->sector(), p->angle.oang, near, 80., NT_Lotag);
neartag(p->GetActor()->getPosWithOffsetZ().plusZ(8), p->GetActor()->sector(), p->angle.ZzOLDANGLE, near, 80., NT_Lotag);
if (near.actor() == nullptr && near.hitWall == nullptr && near.hitSector == nullptr)
neartag(p->GetActor()->getPosWithOffsetZ().plusZ(16), p->GetActor()->sector(), p->angle.oang, near, 80., NT_Lotag);
neartag(p->GetActor()->getPosWithOffsetZ().plusZ(16), p->GetActor()->sector(), p->angle.ZzOLDANGLE, near, 80., NT_Lotag);
if (near.actor() == nullptr && near.hitWall == nullptr && near.hitSector == nullptr)
{
neartag(p->GetActor()->getPosWithOffsetZ().plusZ(16), p->GetActor()->sector(), p->angle.oang, near, 80., NT_Lotag | NT_Hitag);
neartag(p->GetActor()->getPosWithOffsetZ().plusZ(16), p->GetActor()->sector(), p->angle.ZzOLDANGLE, near, 80., NT_Lotag | NT_Hitag);
if (near.actor() != nullptr)
{
switch (near.actor()->spr.picnum)
Expand Down
12 changes: 6 additions & 6 deletions source/games/duke/src/sectors_r.cpp
View file
Expand Up @@ -2379,21 +2379,21 @@ void checksectors_r(int snum)
}
return;
}
neartag(p->GetActor()->getPosWithOffsetZ(), p->GetActor()->sector(), p->angle.oang, near , 80., NT_Lotag | NT_Hitag);
neartag(p->GetActor()->getPosWithOffsetZ(), p->GetActor()->sector(), p->angle.ZzOLDANGLE, near , 80., NT_Lotag | NT_Hitag);
}

if (p->newOwner != nullptr)
neartag(p->GetActor()->getPrevPosWithOffsetZ(), p->GetActor()->sector(), p->angle.oang, near, 80., NT_Lotag);
neartag(p->GetActor()->getPrevPosWithOffsetZ(), p->GetActor()->sector(), p->angle.ZzOLDANGLE, near, 80., NT_Lotag);
else
{
neartag(p->GetActor()->getPosWithOffsetZ(), p->GetActor()->sector(), p->angle.oang, near, 80., NT_Lotag);
neartag(p->GetActor()->getPosWithOffsetZ(), p->GetActor()->sector(), p->angle.ZzOLDANGLE, near, 80., NT_Lotag);
if (near.actor() == nullptr && near.hitWall == nullptr && near.hitSector == nullptr)
neartag(p->GetActor()->getPosWithOffsetZ().plusZ(8), p->GetActor()->sector(), p->angle.oang, near, 80., NT_Lotag);
neartag(p->GetActor()->getPosWithOffsetZ().plusZ(8), p->GetActor()->sector(), p->angle.ZzOLDANGLE, near, 80., NT_Lotag);
if (near.actor() == nullptr && near.hitWall == nullptr && near.hitSector == nullptr)
neartag(p->GetActor()->getPosWithOffsetZ().plusZ(16), p->GetActor()->sector(), p->angle.oang, near, 80., NT_Lotag);
neartag(p->GetActor()->getPosWithOffsetZ().plusZ(16), p->GetActor()->sector(), p->angle.ZzOLDANGLE, near, 80., NT_Lotag);
if (near.actor() == nullptr && near.hitWall == nullptr && near.hitSector == nullptr)
{
neartag(p->GetActor()->getPosWithOffsetZ().plusZ(16), p->GetActor()->sector(), p->angle.oang, near, 80., NT_Lotag | NT_Hitag);
neartag(p->GetActor()->getPosWithOffsetZ().plusZ(16), p->GetActor()->sector(), p->angle.ZzOLDANGLE, near, 80., NT_Lotag | NT_Hitag);
if (near.actor() != nullptr)
{
switch (near.actor()->spr.picnum)
Expand Down
2 changes: 1 addition & 1 deletion source/games/exhumed/src/osdcmds.cpp
View file
Expand Up @@ -48,7 +48,7 @@ void GameInterface::WarpToCoords(double x, double y, double z, DAngle ang)

if (ang != DAngle::fromDeg(INT_MIN))
{
nPlayer->angle.oang = nPlayer->angle.ZzANGLE = ang;
nPlayer->angle.ZzOLDANGLE = nPlayer->angle.ZzANGLE = ang;
}
}

Expand Down
2 changes: 1 addition & 1 deletion source/games/sw/src/osdcmds.cpp
View file
Expand Up @@ -66,7 +66,7 @@ void GameInterface::WarpToCoords(double x, double y, double z, DAngle ang)

if (ang != DAngle::fromDeg(INT_MIN))
{
Player->angle.oang = Player->angle.ZzANGLE = ang;
Player->angle.ZzOLDANGLE = Player->angle.ZzANGLE = ang;
}
}

Expand Down
14 changes: 7 additions & 7 deletions source/games/sw/src/player.cpp
View file
Expand Up @@ -1311,7 +1311,7 @@ void DoPlayerTeleportPause(PLAYER* pp)

void DoPlayerTeleportToSprite(PLAYER* pp, DVector3& pos, DAngle ang)
{
pp->angle.ZzANGLE = pp->angle.oang = ang;
pp->angle.ZzANGLE = pp->angle.ZzOLDANGLE = ang;
pp->actor->spr.pos = pos;
pp->actor->backuppos();

Expand Down Expand Up @@ -5122,7 +5122,7 @@ void DoPlayerBeginOperate(PLAYER* pp)
pp->sop = pp->sop_control = sop;
sop->controller = pp->actor;

pp->angle.oang = pp->angle.ZzANGLE = sop->ang;
pp->angle.ZzOLDANGLE = pp->angle.ZzANGLE = sop->ang;
pp->actor->spr.pos.XY() = sop->pmid.XY();
updatesector(pp->actor->getPosWithOffsetZ(), &pp->cursector);
calcSlope(pp->cursector, pp->actor->getPosWithOffsetZ(), &cz, &fz);
Expand Down Expand Up @@ -5212,7 +5212,7 @@ void DoPlayerBeginRemoteOperate(PLAYER* pp, SECTOR_OBJECT* sop)

auto save_sect = pp->cursector;

pp->angle.oang = pp->angle.ZzANGLE = sop->ang;
pp->angle.ZzOLDANGLE = pp->angle.ZzANGLE = sop->ang;
pp->actor->spr.pos.XY() = sop->pmid.XY();
updatesector(pp->actor->getPosWithOffsetZ(), &pp->cursector);
calcSlope(pp->cursector, pp->actor->getPosWithOffsetZ(), &cz, &fz);
Expand Down Expand Up @@ -5334,9 +5334,9 @@ void DoPlayerStopOperate(PLAYER* pp)
{
DSWActor* rsp = pp->remoteActor;
if (TEST_BOOL1(rsp))
pp->angle.ZzANGLE = pp->angle.oang = rsp->spr.Angles.Yaw; // check me out later.
pp->angle.ZzANGLE = pp->angle.ZzOLDANGLE = rsp->spr.Angles.Yaw; // check me out later.
else
pp->angle.ZzANGLE = pp->angle.oang = (pp->sop_remote->pmid.XY() - pp->actor->spr.pos.XY()).Angle();
pp->angle.ZzANGLE = pp->angle.ZzOLDANGLE = (pp->sop_remote->pmid.XY() - pp->actor->spr.pos.XY()).Angle();
}

if (pp->sop_control)
Expand Down Expand Up @@ -7047,7 +7047,7 @@ void InitAllPlayers(void)
// Initialize all [MAX_SW_PLAYERS] arrays here!
for (pp = Player; pp < &Player[MAX_SW_PLAYERS]; pp++)
{
pp->angle.ZzANGLE = pp->angle.oang = pfirst->angle.ZzANGLE;
pp->angle.ZzANGLE = pp->angle.ZzOLDANGLE = pfirst->angle.ZzANGLE;
pp->horizon.ZzHORIZON = pp->horizon.ZzOLDHORIZON = pfirst->horizon.ZzHORIZON;
pp->cursector = pfirst->cursector;
// set like this so that player can trigger something on start of the level
Expand Down Expand Up @@ -7203,7 +7203,7 @@ void PlayerSpawnPosition(PLAYER* pp)

ASSERT(spawn_sprite != nullptr);

pp->angle.ZzANGLE = pp->angle.oang = spawn_sprite->spr.Angles.Yaw; // check me out later.
pp->angle.ZzANGLE = pp->angle.ZzOLDANGLE = spawn_sprite->spr.Angles.Yaw; // check me out later.
pp->setcursector(spawn_sprite->sector());

if (pp->actor)
Expand Down

0 comments on commit 72de7b2

Please sign in to comment.