From a4bca328bc3c19ee5c433a694769ba359af09257 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Wed, 15 Mar 2023 19:57:45 +1100 Subject: [PATCH] - SW: Remove `Player::siang` since we have the same data in --- source/games/sw/src/draw.cpp | 3 +-- source/games/sw/src/game.h | 1 - source/games/sw/src/player.cpp | 1 - source/games/sw/src/save.cpp | 1 - wadsrc/static/zscript/games/sw/swgame.zs | 1 - 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/source/games/sw/src/draw.cpp b/source/games/sw/src/draw.cpp index 088f10fe2..fcc785b58 100644 --- a/source/games/sw/src/draw.cpp +++ b/source/games/sw/src/draw.cpp @@ -800,7 +800,7 @@ static void analyzesprites(tspriteArray& tsprites, const DVector3& viewpos, doub } tsp->pos = pos; - tsp->Angles.Yaw = pp->siang; + tsp->Angles.Yaw = pp->Angles.RenderAngles.Yaw; //continue; } else @@ -1260,7 +1260,6 @@ void drawscreen(PLAYER* pp, double interpfrac, bool sceneonly) } pp->si = tpos.plusZ(-pp->actor->getOffsetZ()); - pp->siang = tangles.Yaw; QuakeViewChange(camerapp, tpos, tangles.Yaw); int vis = g_visibility; diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h index 805a0883c..fff107c4d 100644 --- a/source/games/sw/src/game.h +++ b/source/games/sw/src/game.h @@ -1744,7 +1744,6 @@ struct PLAYER double circle_camera_dist; DVector3 si; // save player interp position for PlayerSprite - DAngle siang; DVector2 vect, ovect, slide_vect; // these need floatification, but must be done together. vect is in 14.18 format! diff --git a/source/games/sw/src/player.cpp b/source/games/sw/src/player.cpp index cdabe1e3f..ab1ae57cc 100644 --- a/source/games/sw/src/player.cpp +++ b/source/games/sw/src/player.cpp @@ -7464,7 +7464,6 @@ DEFINE_FIELD_X(SWPlayer, PLAYER, circle_camera_dist) //DEFINE_FIELD_X(SWPlayer, PLAYER, six) //DEFINE_FIELD_X(SWPlayer, PLAYER, siy) //DEFINE_FIELD_X(SWPlayer, PLAYER, siz) -DEFINE_FIELD_X(SWPlayer, PLAYER, siang) //DEFINE_FIELD_X(SWPlayer, PLAYER, xvect) //DEFINE_FIELD_X(SWPlayer, PLAYER, yvect) //DEFINE_FIELD_X(SWPlayer, PLAYER, oxvect) diff --git a/source/games/sw/src/save.cpp b/source/games/sw/src/save.cpp index 8e9ceaac0..d1b87182c 100644 --- a/source/games/sw/src/save.cpp +++ b/source/games/sw/src/save.cpp @@ -460,7 +460,6 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PLAYER& w, PLAYER* ("six", w.si.X) ("siy", w.si.Y) ("siz", w.si.Z) - ("siang", w.siang) ("xvect", w.vect.X) ("yvect", w.vect.Y) ("friction", w.friction) diff --git a/wadsrc/static/zscript/games/sw/swgame.zs b/wadsrc/static/zscript/games/sw/swgame.zs index 8556bd136..4d4ccc286 100644 --- a/wadsrc/static/zscript/games/sw/swgame.zs +++ b/wadsrc/static/zscript/games/sw/swgame.zs @@ -198,7 +198,6 @@ struct SWPlayer native native double hiz,loz; native double p_ceiling_dist,p_floor_dist; native double circle_camera_dist; - native double siang; native int friction; native int16 slide_ang;