zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 22:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Replace PLAYERstruct RevolveY with Revolve.Y calls.

Browse source
This commit is contained in:
Mitchell Richters 2021-12-30 17:37:47 +11:00
parent acc11f34bf
commit cf68018909
5 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -664,7 +664,6 @@ struct PLAYERstruct
int oldposx,oldposy,oldposz;
vec3_t Revolve;
int RevolveY;
int16_t RevolveDeltaAng;
binangle RevolveAng;

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

@ -7114,7 +7114,7 @@ DEFINE_FIELD_X(SWPlayer, PLAYERstruct, oldposx)
DEFINE_FIELD_X(SWPlayer, PLAYERstruct, oldposy)
DEFINE_FIELD_X(SWPlayer, PLAYERstruct, oldposz)
//DEFINE_FIELD_X(SWPlayer, PLAYERstruct, Revolve.X)
DEFINE_FIELD_X(SWPlayer, PLAYERstruct, RevolveY)
//DEFINE_FIELD_X(SWPlayer, PLAYERstruct, Revolve.Y)
DEFINE_FIELD_X(SWPlayer, PLAYERstruct, RevolveDeltaAng)
DEFINE_FIELD_X(SWPlayer, PLAYERstruct, pnum)
DEFINE_FIELD_X(SWPlayer, PLAYERstruct, LadderSector)

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

@ -493,7 +493,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PLAYERstruct& w, P
("oldposy", w.oldposy)
("oldposz", w.oldposz)
("revolvex", w.Revolve.X)
("revolvey", w.RevolveY)
("revolvey", w.Revolve.Y)
("RevolveDeltaAng", w.RevolveDeltaAng)
("RevolveAng", w.RevolveAng)
("PlayerSprite", w.actor)

8
source/games/sw/src/track.cpp
View file

@ -734,7 +734,7 @@ void SectorObjectSetupBounds(SECTOR_OBJECTp sop)
{
pp->RevolveAng = pp->angle.ang;
pp->Revolve.X = pp->pos.X;
pp->RevolveY = pp->posy;
pp->Revolve.Y = pp->pos.Y;
pp->RevolveDeltaAng = 0;
pp->Flags |= (PF_PLAYER_RIDING);
@ -1525,7 +1525,7 @@ void MovePlayer(PLAYERp pp, SECTOR_OBJECTp sop, int nx, int ny)
pp->RevolveAng = pp->angle.ang;
pp->Revolve.X = pp->pos.X;
pp->RevolveY = pp->pos.Y;
pp->Revolve.Y = pp->pos.Y;
// set the delta angle to 0 when moving
pp->RevolveDeltaAng = 0;
@ -1549,7 +1549,7 @@ void MovePlayer(PLAYERp pp, SECTOR_OBJECTp sop, int nx, int ny)
// know where he was last
pp->RevolveAng = pp->angle.ang;
pp->Revolve.X = pp->pos.X;
pp->RevolveY = pp->pos.Y;
pp->Revolve.Y = pp->pos.Y;
// set the delta angle to 0 when moving
pp->RevolveDeltaAng = 0;
@ -1560,7 +1560,7 @@ void MovePlayer(PLAYERp pp, SECTOR_OBJECTp sop, int nx, int ny)
// Move saved x&y variables
pp->Revolve.X += nx;
pp->RevolveY += ny;
pp->Revolve.Y += ny;
// Last known angle is now adjusted by the delta angle
pp->RevolveAng = pp->angle.ang - buildang(pp->RevolveDeltaAng);

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

@ -220,7 +220,6 @@ struct SWPlayer native
native int recoil_horizoff;
native int oldposx,oldposy,oldposz;
native int RevolveY;
native int16 RevolveDeltaAng;
native int16 pnum; // carry along the player number