teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-19 15:40:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Replace PLAYERstruct oyvect with ovect.Y calls.

Browse source
This commit is contained in:
Mitchell Richters 2021-12-30 23:56:51 +11:00
parent 75cc539c58
commit 8c99053ebd
4 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/games/sw/src/game.h
View file

@ -632,7 +632,6 @@ struct PLAYERstruct
int16_t siang; int16_t siang;
vec2_t vect, ovect; vec2_t vect, ovect;
int oyvect;
int friction; int friction;
int slide_xvect, slide_yvect; int slide_xvect, slide_yvect;
int16_t slide_ang; int16_t slide_ang;

26
source/games/sw/src/player.cpp
View file

@ -1244,7 +1244,7 @@ DSWActor* DoPickTarget(DSWActor* actor, uint32_t max_delta_ang, int skip_targets
void DoPlayerResetMovement(PLAYERp pp) void DoPlayerResetMovement(PLAYERp pp)
{ {
pp->vect.X = pp->ovect.X = 0; pp->vect.X = pp->ovect.X = 0;
pp->vect.Y = pp->oyvect = 0; pp->vect.Y = pp->ovect.Y = 0;
pp->slide_xvect = 0; pp->slide_xvect = 0;
pp->slide_yvect = 0; pp->slide_yvect = 0;
pp->drive_avel = 0; pp->drive_avel = 0;
@ -2012,7 +2012,7 @@ void DoPlayerMove(PLAYERp pp)
DoPlayerSlide(pp); DoPlayerSlide(pp);
pp->ovect.X = pp->vect.X; pp->ovect.X = pp->vect.X;
pp->oyvect = pp->vect.Y; pp->ovect.Y = pp->vect.Y;
pp->vect.X += ((pp->input.fvel*synctics*2)<<6); pp->vect.X += ((pp->input.fvel*synctics*2)<<6);
pp->vect.Y += ((pp->input.svel*synctics*2)<<6); pp->vect.Y += ((pp->input.svel*synctics*2)<<6);
@ -2030,13 +2030,13 @@ void DoPlayerMove(PLAYERp pp)
{ {
// do a bit of weighted averaging // do a bit of weighted averaging
pp->vect.X = (pp->vect.X + (pp->ovect.X*1))/2; pp->vect.X = (pp->vect.X + (pp->ovect.X*1))/2;
pp->vect.Y = (pp->vect.Y + (pp->oyvect*1))/2; pp->vect.Y = (pp->vect.Y + (pp->ovect.Y*1))/2;
} }
else if (pp->Flags & (PF_DIVING)) else if (pp->Flags & (PF_DIVING))
{ {
// do a bit of weighted averaging // do a bit of weighted averaging
pp->vect.X = (pp->vect.X + (pp->ovect.X*2))/3; pp->vect.X = (pp->vect.X + (pp->ovect.X*2))/3;
pp->vect.Y = (pp->vect.Y + (pp->oyvect*2))/3; pp->vect.Y = (pp->vect.Y + (pp->ovect.Y*2))/3;
} }
if (labs(pp->vect.X) < 12800 && labs(pp->vect.Y) < 12800) if (labs(pp->vect.X) < 12800 && labs(pp->vect.Y) < 12800)
@ -2537,7 +2537,7 @@ void DoPlayerMoveVehicle(PLAYERp pp)
pp->Flags |= (PF_PLAYER_MOVED); pp->Flags |= (PF_PLAYER_MOVED);
pp->ovect.X = pp->vect.X; pp->ovect.X = pp->vect.X;
pp->oyvect = pp->vect.Y; pp->ovect.Y = pp->vect.Y;
if (sop->drive_speed) if (sop->drive_speed)
{ {
@ -2546,7 +2546,7 @@ void DoPlayerMoveVehicle(PLAYERp pp)
// does sliding/momentum // does sliding/momentum
pp->vect.X = (pp->vect.X + (pp->ovect.X*(sop->drive_slide-1)))/sop->drive_slide; pp->vect.X = (pp->vect.X + (pp->ovect.X*(sop->drive_slide-1)))/sop->drive_slide;
pp->vect.Y = (pp->vect.Y + (pp->oyvect*(sop->drive_slide-1)))/sop->drive_slide; pp->vect.Y = (pp->vect.Y + (pp->ovect.Y*(sop->drive_slide-1)))/sop->drive_slide;
} }
else else
{ {
@ -2557,7 +2557,7 @@ void DoPlayerMoveVehicle(PLAYERp pp)
pp->vect.Y = MulScale(pp->vect.Y, TANK_FRICTION, 16); pp->vect.Y = MulScale(pp->vect.Y, TANK_FRICTION, 16);
pp->vect.X = (pp->vect.X + (pp->ovect.X*1))/2; pp->vect.X = (pp->vect.X + (pp->ovect.X*1))/2;
pp->vect.Y = (pp->vect.Y + (pp->oyvect*1))/2; pp->vect.Y = (pp->vect.Y + (pp->ovect.Y*1))/2;
} }
if (labs(pp->vect.X) < 12800 && labs(pp->vect.Y) < 12800) if (labs(pp->vect.X) < 12800 && labs(pp->vect.Y) < 12800)
@ -2643,7 +2643,7 @@ void DoPlayerMoveVehicle(PLAYERp pp)
if (vel > 12000) if (vel > 12000)
{ {
pp->vect.X = pp->vect.Y = pp->ovect.X = pp->oyvect = 0; pp->vect.X = pp->vect.Y = pp->ovect.X = pp->ovect.Y = 0;
} }
} }
} }
@ -2691,7 +2691,7 @@ void DoPlayerMoveVehicle(PLAYERp pp)
if (vel > 12000) if (vel > 12000)
{ {
pp->vect.X = pp->vect.Y = pp->ovect.X = pp->oyvect = 0; pp->vect.X = pp->vect.Y = pp->ovect.X = pp->ovect.Y = 0;
} }
} }
} }
@ -5056,7 +5056,7 @@ void PlayerToRemote(PLAYERp pp)
pp->remote.xvect = pp->vect.X; pp->remote.xvect = pp->vect.X;
pp->remote.yvect = pp->vect.Y; pp->remote.yvect = pp->vect.Y;
pp->remote.oxvect = pp->ovect.X; pp->remote.oxvect = pp->ovect.X;
pp->remote.oyvect = pp->oyvect; pp->remote.oyvect = pp->ovect.Y;
pp->remote.slide_xvect = pp->slide_xvect; pp->remote.slide_xvect = pp->slide_xvect;
pp->remote.slide_yvect = pp->slide_yvect; pp->remote.slide_yvect = pp->slide_yvect;
} }
@ -5073,7 +5073,7 @@ void RemoteToPlayer(PLAYERp pp)
pp->vect.X = pp->remote.xvect; pp->vect.X = pp->remote.xvect;
pp->vect.Y = pp->remote.yvect; pp->vect.Y = pp->remote.yvect;
pp->ovect.X = pp->remote.oxvect; pp->ovect.X = pp->remote.oxvect;
pp->oyvect = pp->remote.oyvect; pp->ovect.Y = pp->remote.oyvect;
pp->slide_xvect = pp->remote.slide_xvect; pp->slide_xvect = pp->remote.slide_xvect;
pp->slide_yvect = pp->remote.slide_yvect; pp->slide_yvect = pp->remote.slide_yvect;
} }
@ -5088,7 +5088,7 @@ void PlayerRemoteReset(PLAYERp pp, sectortype* sect)
pp->pos.Y = rsp->spr.pos.Y; pp->pos.Y = rsp->spr.pos.Y;
pp->pos.Z = sect->floorz - PLAYER_HEIGHT; pp->pos.Z = sect->floorz - PLAYER_HEIGHT;
pp->vect.X = pp->vect.Y = pp->ovect.X = pp->oyvect = pp->slide_xvect = pp->slide_yvect = 0; pp->vect.X = pp->vect.Y = pp->ovect.X = pp->ovect.Y = pp->slide_xvect = pp->slide_yvect = 0;
UpdatePlayerSprite(pp); UpdatePlayerSprite(pp);
} }
@ -7089,7 +7089,7 @@ DEFINE_FIELD_X(SWPlayer, PLAYERstruct, siang)
//DEFINE_FIELD_X(SWPlayer, PLAYERstruct, xvect) //DEFINE_FIELD_X(SWPlayer, PLAYERstruct, xvect)
//DEFINE_FIELD_X(SWPlayer, PLAYERstruct, yvect) //DEFINE_FIELD_X(SWPlayer, PLAYERstruct, yvect)
//DEFINE_FIELD_X(SWPlayer, PLAYERstruct, oxvect) //DEFINE_FIELD_X(SWPlayer, PLAYERstruct, oxvect)
DEFINE_FIELD_X(SWPlayer, PLAYERstruct, oyvect) //DEFINE_FIELD_X(SWPlayer, PLAYERstruct, oyvect)
DEFINE_FIELD_X(SWPlayer, PLAYERstruct, friction) DEFINE_FIELD_X(SWPlayer, PLAYERstruct, friction)
DEFINE_FIELD_X(SWPlayer, PLAYERstruct, slide_xvect) DEFINE_FIELD_X(SWPlayer, PLAYERstruct, slide_xvect)
DEFINE_FIELD_X(SWPlayer, PLAYERstruct, slide_yvect) DEFINE_FIELD_X(SWPlayer, PLAYERstruct, slide_yvect)

2
source/games/sw/src/save.cpp
View file

@ -584,7 +584,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PLAYERstruct& w, P
w.opos.Z = w.pos.X; w.opos.Z = w.pos.X;
w.oz_speed = w.z_speed; w.oz_speed = w.z_speed;
w.ovect.X = w.vect.X; w.ovect.X = w.vect.X;
w.oyvect = w.vect.Y; w.ovect.Y = w.vect.Y;
w.obob_z = w.bob_z; w.obob_z = w.bob_z;
w.input = {}; w.input = {};
w.lastinput = {}; w.lastinput = {};

1
wadsrc/static/zscript/games/sw/swgame.zs
View file

@ -196,7 +196,6 @@ struct SWPlayer native
native int circle_camera_dist; native int circle_camera_dist;
native int16 siang; native int16 siang;
native int oyvect;
native int friction; native int friction;
native int slide_xvect, slide_yvect; native int slide_xvect, slide_yvect;
native int16 slide_ang; native int16 slide_ang;