From e4d19a0bbef12fe862c5a739e1383d7786479840 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Fri, 31 Dec 2021 00:00:29 +1100 Subject: [PATCH] - SW: Replace `PLAYERstruct` `slide_yvect` with `slide_vect.Y` calls. --- source/games/sw/src/game.h | 1 - source/games/sw/src/player.cpp | 24 ++++++++++++------------ source/games/sw/src/save.cpp | 2 +- source/games/sw/src/weapon.cpp | 6 +++--- wadsrc/static/zscript/games/sw/swgame.zs | 1 - 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h index 77219bba1..88c8dceaa 100644 --- a/source/games/sw/src/game.h +++ b/source/games/sw/src/game.h @@ -633,7 +633,6 @@ struct PLAYERstruct vec2_t vect, ovect, slide_vect; int friction; - int slide_yvect; int16_t slide_ang; int slide_dec; float drive_avel; diff --git a/source/games/sw/src/player.cpp b/source/games/sw/src/player.cpp index d7f837a06..8f088dd57 100644 --- a/source/games/sw/src/player.cpp +++ b/source/games/sw/src/player.cpp @@ -1246,7 +1246,7 @@ void DoPlayerResetMovement(PLAYERp pp) pp->vect.X = pp->ovect.X = 0; pp->vect.Y = pp->ovect.Y = 0; pp->slide_vect.X = 0; - pp->slide_yvect = 0; + pp->slide_vect.Y = 0; pp->drive_avel = 0; pp->Flags &= ~(PF_PLAYER_MOVED); } @@ -1885,17 +1885,17 @@ void DoPlayerSlide(PLAYERp pp) int push_ret; - if ((pp->slide_vect.X|pp->slide_yvect) == 0) + if ((pp->slide_vect.X|pp->slide_vect.Y) == 0) return; if (pp->sop) return; pp->slide_vect.X = MulScale(pp->slide_vect.X, PLAYER_SLIDE_FRICTION, 16); - pp->slide_yvect = MulScale(pp->slide_yvect, PLAYER_SLIDE_FRICTION, 16); + pp->slide_vect.Y = MulScale(pp->slide_vect.Y, PLAYER_SLIDE_FRICTION, 16); - if (labs(pp->slide_vect.X) < 12800 && labs(pp->slide_yvect) < 12800) - pp->slide_vect.X = pp->slide_yvect = 0; + if (labs(pp->slide_vect.X) < 12800 && labs(pp->slide_vect.Y) < 12800) + pp->slide_vect.X = pp->slide_vect.Y = 0; push_ret = pushmove(&pp->pos, &pp->cursector, ((int)actor->spr.clipdist<<2), pp->ceiling_dist, pp->floor_dist, CLIPMASK_PLAYER); if (push_ret < 0) @@ -1911,7 +1911,7 @@ void DoPlayerSlide(PLAYERp pp) return; } Collision coll; - clipmove(pp->pos, &pp->cursector, pp->slide_vect.X, pp->slide_yvect, ((int)actor->spr.clipdist<<2), pp->ceiling_dist, pp->floor_dist, CLIPMASK_PLAYER, coll); + clipmove(pp->pos, &pp->cursector, pp->slide_vect.X, pp->slide_vect.Y, ((int)actor->spr.clipdist<<2), pp->ceiling_dist, pp->floor_dist, CLIPMASK_PLAYER, coll); PlayerCheckValidMove(pp); push_ret = pushmove(&pp->pos, &pp->cursector, ((int)actor->spr.clipdist<<2), pp->ceiling_dist, pp->floor_dist, CLIPMASK_PLAYER); @@ -2684,7 +2684,7 @@ void DoPlayerMoveVehicle(PLAYERp pp) { VehicleMoveHit(actor); pp->slide_vect.X = -pp->vect.X<<1; - pp->slide_yvect = -pp->vect.Y<<1; + pp->slide_vect.Y = -pp->vect.Y<<1; if (!(sop->flags & SOBJ_NO_QUAKE)) SetPlayerQuake(pp); } @@ -5058,7 +5058,7 @@ void PlayerToRemote(PLAYERp pp) pp->remote.oxvect = pp->ovect.X; pp->remote.oyvect = pp->ovect.Y; pp->remote.slide_xvect = pp->slide_vect.X; - pp->remote.slide_yvect = pp->slide_yvect; + pp->remote.slide_yvect = pp->slide_vect.Y; } void RemoteToPlayer(PLAYERp pp) @@ -5075,7 +5075,7 @@ void RemoteToPlayer(PLAYERp pp) pp->ovect.X = pp->remote.oxvect; pp->ovect.Y = pp->remote.oyvect; pp->slide_vect.X = pp->remote.slide_xvect; - pp->slide_yvect = pp->remote.slide_yvect; + pp->slide_vect.Y = pp->remote.slide_yvect; } void PlayerRemoteReset(PLAYERp pp, sectortype* sect) @@ -5088,7 +5088,7 @@ void PlayerRemoteReset(PLAYERp pp, sectortype* sect) pp->pos.Y = rsp->spr.pos.Y; pp->pos.Z = sect->floorz - PLAYER_HEIGHT; - pp->vect.X = pp->vect.Y = pp->ovect.X = pp->ovect.Y = pp->slide_vect.X = pp->slide_yvect = 0; + pp->vect.X = pp->vect.Y = pp->ovect.X = pp->ovect.Y = pp->slide_vect.X = pp->slide_vect.Y = 0; UpdatePlayerSprite(pp); } @@ -5511,7 +5511,7 @@ void DoPlayerBeginDie(PLAYERp pp) pp->input.actions &= ~SB_CENTERVIEW; pp->friction = PLAYER_RUN_FRICTION; - pp->slide_vect.X = pp->slide_yvect = 0; + pp->slide_vect.X = pp->slide_vect.Y = 0; pp->floor_dist = PLAYER_WADE_FLOOR_DIST; pp->ceiling_dist = PLAYER_WADE_CEILING_DIST; ASSERT(pp->DeathType < SIZ(PlayerDeathFunc)); @@ -7092,7 +7092,7 @@ DEFINE_FIELD_X(SWPlayer, PLAYERstruct, siang) //DEFINE_FIELD_X(SWPlayer, PLAYERstruct, oyvect) DEFINE_FIELD_X(SWPlayer, PLAYERstruct, friction) //DEFINE_FIELD_X(SWPlayer, PLAYERstruct, slide_xvect) -DEFINE_FIELD_X(SWPlayer, PLAYERstruct, slide_yvect) +//DEFINE_FIELD_X(SWPlayer, PLAYERstruct, slide_yvect) DEFINE_FIELD_X(SWPlayer, PLAYERstruct, slide_ang) DEFINE_FIELD_X(SWPlayer, PLAYERstruct, slide_dec) DEFINE_FIELD_X(SWPlayer, PLAYERstruct, drive_avel) diff --git a/source/games/sw/src/save.cpp b/source/games/sw/src/save.cpp index 4cc37a522..2fbfdc8c1 100644 --- a/source/games/sw/src/save.cpp +++ b/source/games/sw/src/save.cpp @@ -469,7 +469,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PLAYERstruct& w, P ("yvect", w.vect.Y) ("friction", w.friction) ("slide_xvect", w.slide_vect.X) - ("slide_yvect", w.slide_yvect) + ("slide_yvect", w.slide_vect.Y) ("slide_ang", w.slide_ang) ("slide_dec", w.slide_dec) ("drive_avel", w.drive_avel) diff --git a/source/games/sw/src/weapon.cpp b/source/games/sw/src/weapon.cpp index 70433241d..ee79e55a1 100644 --- a/source/games/sw/src/weapon.cpp +++ b/source/games/sw/src/weapon.cpp @@ -5242,14 +5242,14 @@ int PlayerDamageSlide(PLAYERp pp, int damage, short ang) { //nudge pp->slide_vect.X = MOVEx(16, ang)<<15; - pp->slide_yvect = MOVEy(16, ang)<<15; + pp->slide_vect.Y = MOVEy(16, ang)<<15; return true; } else if (damage <= 20) { //bigger nudge pp->slide_vect.X = MOVEx(64, ang)<<15; - pp->slide_yvect = MOVEy(64, ang)<<15; + pp->slide_vect.Y = MOVEy(64, ang)<<15; return true; } else @@ -5257,7 +5257,7 @@ int PlayerDamageSlide(PLAYERp pp, int damage, short ang) slide_vel = (damage * 6); pp->slide_vect.X = MOVEx(slide_vel, ang)<<15; - pp->slide_yvect = MOVEy(slide_vel, ang)<<15; + pp->slide_vect.Y = MOVEy(slide_vel, ang)<<15; return true; } diff --git a/wadsrc/static/zscript/games/sw/swgame.zs b/wadsrc/static/zscript/games/sw/swgame.zs index 315eb2c8e..c0f947f53 100644 --- a/wadsrc/static/zscript/games/sw/swgame.zs +++ b/wadsrc/static/zscript/games/sw/swgame.zs @@ -197,7 +197,6 @@ struct SWPlayer native native int16 siang; native int friction; - native int slide_yvect; native int16 slide_ang; native int slide_dec; native float drive_avel;