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

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

Browse source
This commit is contained in:
Mitchell Richters 2022-11-25 16:27:55 +11:00 committed by Christoph Oelckers
parent 644cf82238
commit 3a0ec29c18
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/core/gameinput.cpp
View file

@ -344,7 +344,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngle& w, Pl
if (arc.isReading())
{
w.ZzOLDANGLE = w.ZzANGLE;
w.olook_ang = w.ZzLOOKANG;
w.ZzOLDLOOKANG = w.ZzLOOKANG;
w.orotscrnang = w.rotscrnang;
w.inputdisabled = w.inputdisabled;
w.resetadjustment();

10
source/core/gameinput.h
View file

@ -100,7 +100,7 @@ private:
struct PlayerAngle
{
DAngle ZzANGLE, ZzOLDANGLE, ZzLOOKANG, olook_ang, rotscrnang, orotscrnang, spin;
DAngle ZzANGLE, ZzOLDANGLE, ZzLOOKANG, ZzOLDLOOKANG, rotscrnang, orotscrnang, spin;
friend FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngle& w, PlayerAngle* def);
@ -111,22 +111,22 @@ struct PlayerAngle
void backup()
{
ZzOLDANGLE = ZzANGLE;
olook_ang = ZzLOOKANG;
ZzOLDLOOKANG = ZzLOOKANG;
orotscrnang = rotscrnang;
}
void restore()
{
ZzANGLE = ZzOLDANGLE;
ZzLOOKANG = olook_ang;
ZzLOOKANG = ZzOLDLOOKANG;
rotscrnang = orotscrnang;
}
// Commonly used getters.
DAngle osum() { return ZzOLDANGLE + olook_ang; }
DAngle osum() { return ZzOLDANGLE + ZzOLDLOOKANG; }
DAngle sum() { return ZzANGLE + ZzLOOKANG; }
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(olook_ang, ZzLOOKANG, interpfrac); }
DAngle interpolatedlookang(double const interpfrac) { return interpolatedvalue(ZzOLDLOOKANG, ZzLOOKANG, interpfrac); }
DAngle interpolatedrotscrn(double const interpfrac) { return interpolatedvalue(orotscrnang, rotscrnang, interpfrac); }
DAngle renderlookang(double const interpfrac) { return !SyncInput() ? ZzLOOKANG : interpolatedlookang(interpfrac); }
DAngle renderrotscrn(double const interpfrac) { return !SyncInput() ? rotscrnang : interpolatedrotscrn(interpfrac); }

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

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