diff --git a/source/core/gameinput.cpp b/source/core/gameinput.cpp index 7986767f0..af2281d29 100644 --- a/source/core/gameinput.cpp +++ b/source/core/gameinput.cpp @@ -226,12 +226,12 @@ void PlayerAngle::applyinput(float const avel, ESyncBits* actions, double const { // Process angle return to zeros. scaletozero(rotscrnang, YAW_LOOKRETURN, scaleAdjust); - scaletozero(look_ang, YAW_LOOKRETURN, scaleAdjust); + scaletozero(ZzLOOKANG, YAW_LOOKRETURN, scaleAdjust); // Process keyboard input. 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; } @@ -335,7 +335,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngle& w, Pl if (arc.BeginObject(keyname)) { arc("ang", w.ZzANGLE) - ("lookang", w.look_ang) + ("lookang", w.ZzLOOKANG) ("rotscrnang", w.rotscrnang) ("spin", w.spin) ("inputdisabled", w.inputdisabled) @@ -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.look_ang; + w.olook_ang = w.ZzLOOKANG; w.orotscrnang = w.rotscrnang; w.inputdisabled = w.inputdisabled; w.resetadjustment(); diff --git a/source/core/gameinput.h b/source/core/gameinput.h index 39220208b..508af2933 100644 --- a/source/core/gameinput.h +++ b/source/core/gameinput.h @@ -100,7 +100,7 @@ private: 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); @@ -111,24 +111,24 @@ struct PlayerAngle void backup() { ZzOLDANGLE = ZzANGLE; - olook_ang = look_ang; + olook_ang = ZzLOOKANG; orotscrnang = rotscrnang; } void restore() { ZzANGLE = ZzOLDANGLE; - look_ang = olook_ang; + ZzLOOKANG = olook_ang; rotscrnang = orotscrnang; } // Commonly used getters. 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 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 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); } // Ticrate playsim adjustment helpers. diff --git a/source/games/duke/src/gameexec.cpp b/source/games/duke/src/gameexec.cpp index 8dbf05308..bfec0813b 100644 --- a/source/games/duke/src/gameexec.cpp +++ b/source/games/duke/src/gameexec.cpp @@ -490,8 +490,8 @@ void DoPlayer(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor, break; case PLAYER_LOOK_ANG: - if (bSet) ps[iPlayer].angle.look_ang = mapangle(lValue); - else SetGameVarID(lVar2, ps[iPlayer].angle.look_ang.Buildang(), sActor, sPlayer); + if (bSet) ps[iPlayer].angle.ZzLOOKANG = mapangle(lValue); + else SetGameVarID(lVar2, ps[iPlayer].angle.ZzLOOKANG.Buildang(), sActor, sPlayer); break; case PLAYER_LAST_EXTRA: diff --git a/source/games/duke/src/player.cpp b/source/games/duke/src/player.cpp index 101387e58..2c76c3863 100644 --- a/source/games/duke/src/player.cpp +++ b/source/games/duke/src/player.cpp @@ -119,7 +119,7 @@ void forceplayerangle(int snum) p->horizon.addPitch(DAngle::fromDeg(-26.566)); 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); } if (SeaSick < 250) - angle.look_ang = DAngle::fromDeg(((krand() & 255) - 128) * factor * BAngToDegree); + angle.ZzLOOKANG = DAngle::fromDeg(((krand() & 255) - 128) * factor * BAngToDegree); } } diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/premap.cpp index f4cf866b4..c7deb8483 100644 --- a/source/games/duke/src/premap.cpp +++ b/source/games/duke/src/premap.cpp @@ -151,7 +151,7 @@ void resetplayerstats(int snum) p->jetpack_on = 0; 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->newOwner =nullptr;