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

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

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

8
source/core/gameinput.cpp
View file

@ -226,12 +226,12 @@ void PlayerAngle::applyinput(float const avel, ESyncBits* actions, double const
{ {
// Process angle return to zeros. // Process angle return to zeros.
scaletozero(rotscrnang, YAW_LOOKRETURN, scaleAdjust); scaletozero(rotscrnang, YAW_LOOKRETURN, scaleAdjust);
scaletozero(look_ang, YAW_LOOKRETURN, scaleAdjust); scaletozero(ZzLOOKANG, YAW_LOOKRETURN, scaleAdjust);
// Process keyboard input. // Process keyboard input.
if (auto looking = !!(*actions & SB_LOOK_RIGHT) - !!(*actions & SB_LOOK_LEFT)) if (auto looking = !!(*actions & SB_LOOK_RIGHT) - !!(*actions & SB_LOOK_LEFT))
{ {
look_ang += getTicrateScale(YAW_LOOKINGSPEED) * getCorrectedScale(scaleAdjust) * looking; ZzLOOKANG += getTicrateScale(YAW_LOOKINGSPEED) * getCorrectedScale(scaleAdjust) * looking;
rotscrnang -= getTicrateScale(YAW_ROTATESPEED) * getCorrectedScale(scaleAdjust) * looking; rotscrnang -= getTicrateScale(YAW_ROTATESPEED) * getCorrectedScale(scaleAdjust) * looking;
} }
@ -335,7 +335,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngle& w, Pl
if (arc.BeginObject(keyname)) if (arc.BeginObject(keyname))
{ {
arc("ang", w.ZzANGLE) arc("ang", w.ZzANGLE)
("lookang", w.look_ang) ("lookang", w.ZzLOOKANG)
("rotscrnang", w.rotscrnang) ("rotscrnang", w.rotscrnang)
("spin", w.spin) ("spin", w.spin)
("inputdisabled", w.inputdisabled) ("inputdisabled", w.inputdisabled)
@ -344,7 +344,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngle& w, Pl
if (arc.isReading()) if (arc.isReading())
{ {
w.ZzOLDANGLE = w.ZzANGLE; w.ZzOLDANGLE = w.ZzANGLE;
w.olook_ang = w.look_ang; w.olook_ang = w.ZzLOOKANG;
w.orotscrnang = w.rotscrnang; w.orotscrnang = w.rotscrnang;
w.inputdisabled = w.inputdisabled; w.inputdisabled = w.inputdisabled;
w.resetadjustment(); w.resetadjustment();

12
source/core/gameinput.h
View file

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

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

@ -490,8 +490,8 @@ void DoPlayer(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor,
break; break;
case PLAYER_LOOK_ANG: case PLAYER_LOOK_ANG:
if (bSet) ps[iPlayer].angle.look_ang = mapangle(lValue); if (bSet) ps[iPlayer].angle.ZzLOOKANG = mapangle(lValue);
else SetGameVarID(lVar2, ps[iPlayer].angle.look_ang.Buildang(), sActor, sPlayer); else SetGameVarID(lVar2, ps[iPlayer].angle.ZzLOOKANG.Buildang(), sActor, sPlayer);
break; break;
case PLAYER_LAST_EXTRA: case PLAYER_LAST_EXTRA:

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

@ -119,7 +119,7 @@ void forceplayerangle(int snum)
p->horizon.addPitch(DAngle::fromDeg(-26.566)); p->horizon.addPitch(DAngle::fromDeg(-26.566));
p->sync.actions |= SB_CENTERVIEW; p->sync.actions |= SB_CENTERVIEW;
p->angle.rotscrnang = p->angle.look_ang = (DAngle22_5 - randomAngle(45)) / 2.; p->angle.rotscrnang = p->angle.ZzLOOKANG = (DAngle22_5 - randomAngle(45)) / 2.;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -750,7 +750,7 @@ void player_struct::apply_seasick(double factor)
angle.rotscrnang -= DAngle::fromDeg(24 * factor * BAngToDegree); angle.rotscrnang -= DAngle::fromDeg(24 * factor * BAngToDegree);
} }
if (SeaSick < 250) if (SeaSick < 250)
angle.look_ang = DAngle::fromDeg(((krand() & 255) - 128) * factor * BAngToDegree); angle.ZzLOOKANG = DAngle::fromDeg(((krand() & 255) - 128) * factor * BAngToDegree);
} }
} }

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

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