teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-03-21 17:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Rename PlayerAngle::orotscrnang in preparation for replacement work.

Browse source
This commit is contained in:
Mitchell Richters 2022-11-25 16:31:29 +11:00 committed by Christoph Oelckers
parent 7d34288290
commit a42750f37f
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/core/gameinput.cpp
View file

@ -345,7 +345,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngle& w, Pl
{
w.ZzOLDANGLE = w.ZzANGLE;
w.ZzOLDLOOKANG = w.ZzLOOKANG;
w.orotscrnang = w.ZzROTSCRNANG;
w.ZzOLDROTSCRNANG = w.ZzROTSCRNANG;
w.inputdisabled = w.inputdisabled;
w.resetadjustment();
}

8
source/core/gameinput.h
View file

@ -100,7 +100,7 @@ private:
struct PlayerAngle
{
DAngle ZzANGLE, ZzOLDANGLE, ZzLOOKANG, ZzOLDLOOKANG, ZzROTSCRNANG, orotscrnang, spin;
DAngle ZzANGLE, ZzOLDANGLE, ZzLOOKANG, ZzOLDLOOKANG, ZzROTSCRNANG, ZzOLDROTSCRNANG, spin;
friend FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngle& w, PlayerAngle* def);
@ -112,13 +112,13 @@ struct PlayerAngle
{
ZzOLDANGLE = ZzANGLE;
ZzOLDLOOKANG = ZzLOOKANG;
orotscrnang = ZzROTSCRNANG;
ZzOLDROTSCRNANG = ZzROTSCRNANG;
}
void restore()
{
ZzANGLE = ZzOLDANGLE;
ZzLOOKANG = ZzOLDLOOKANG;
ZzROTSCRNANG = orotscrnang;
ZzROTSCRNANG = ZzOLDROTSCRNANG;
}
// Commonly used getters.
@ -127,7 +127,7 @@ struct PlayerAngle
DAngle interpolatedsum(double const interpfrac) { return interpolatedvalue(osum(), sum(), interpfrac); }
DAngle interpolatedang(double const interpfrac) { return interpolatedvalue(ZzOLDANGLE, ZzANGLE, interpfrac); }
DAngle interpolatedlookang(double const interpfrac) { return interpolatedvalue(ZzOLDLOOKANG, ZzLOOKANG, interpfrac); }
DAngle interpolatedrotscrn(double const interpfrac) { return interpolatedvalue(orotscrnang, ZzROTSCRNANG, interpfrac); }
DAngle interpolatedrotscrn(double const interpfrac) { return interpolatedvalue(ZzOLDROTSCRNANG, ZzROTSCRNANG, interpfrac); }
DAngle renderlookang(double const interpfrac) { return !SyncInput() ? ZzLOOKANG : interpolatedlookang(interpfrac); }
DAngle renderrotscrn(double const interpfrac) { return !SyncInput() ? ZzROTSCRNANG : interpolatedrotscrn(interpfrac); }

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

@ -710,7 +710,7 @@ void DoPlayer(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor,
break;
case PLAYER_ROTSCRNANG:
if (bSet) ps[iPlayer].angle.orotscrnang = ps[iPlayer].angle.ZzROTSCRNANG = mapangle(lValue);
if (bSet) ps[iPlayer].angle.ZzOLDROTSCRNANG = ps[iPlayer].angle.ZzROTSCRNANG = mapangle(lValue);
else SetGameVarID(lVar2, ps[iPlayer].angle.ZzROTSCRNANG.Buildang(), sActor, sPlayer);
break;
@ -2261,7 +2261,7 @@ int ParseState::parse(void)
ps[g_p].weapreccnt = 0;
ps[g_p].ftq = 0;
ps[g_p].vel.X = ps[g_p].vel.Y = 0;
if (!isRR()) ps[g_p].angle.orotscrnang = ps[g_p].angle.ZzROTSCRNANG = nullAngle;
if (!isRR()) ps[g_p].angle.ZzOLDROTSCRNANG = ps[g_p].angle.ZzROTSCRNANG = nullAngle;
ps[g_p].falling_counter = 0;

2
source/games/duke/src/premap.cpp
View file

@ -152,7 +152,7 @@ void resetplayerstats(int snum)
p->holoduke_on = nullptr;
p->angle.ZzOLDLOOKANG = p->angle.ZzLOOKANG = (currentLevel->levelNumber & 1)? DAngle90 : -DAngle90;
p->angle.orotscrnang = p->angle.ZzROTSCRNANG = nullAngle;
p->angle.ZzOLDROTSCRNANG = p->angle.ZzROTSCRNANG = nullAngle;
p->newOwner =nullptr;
p->jumping_counter = 0;