zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-20 18:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Remove player_struct::posoldX(), player_struct::posoldY(), and player_struct::posoldXY().

Browse source
This commit is contained in:
Mitchell Richters 2022-11-20 20:00:26 +11:00 committed by Christoph Oelckers
parent 4551274e7d
commit 66a08a26e8
8 changed files with 15 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/duke/src/actors.cpp
View file

@ -4392,8 +4392,8 @@ void movefta(void)
if (badguy(act))
{
auto xyrand = []() -> double { return (64 - (krand() & 127)) * maptoworld; };
double px = ps[p].posoldX() - xyrand();
double py = ps[p].posoldY() - xyrand();
double px = ps[p].GetActor()->opos.X - xyrand();
double py = ps[p].GetActor()->opos.Y - xyrand();
updatesector(DVector3(px, py, 0), &psect);
if (psect == nullptr)
{

4
source/games/duke/src/actors_d.cpp
View file

@ -3032,7 +3032,7 @@ void move_d(DDukeActor *actor, int playernum, int xvel)
if (a & face_player)
{
if (ps[playernum].newOwner != nullptr)
goalang = (ps[playernum].posoldXY() - actor->spr.pos.XY()).Angle();
goalang = (ps[playernum].GetActor()->opos.XY() - actor->spr.pos.XY()).Angle();
else goalang = (ps[playernum].GetActor()->spr.pos.XY() - actor->spr.pos.XY()).Angle();
angdif = deltaangle(actor->spr.angle, goalang) * 0.25;
if (angdif > -DAngle22_5 / 16 && angdif < nullAngle) angdif = nullAngle;
@ -3045,7 +3045,7 @@ void move_d(DDukeActor *actor, int playernum, int xvel)
if (a & face_player_slow)
{
if (ps[playernum].newOwner != nullptr)
goalang = (ps[playernum].posoldXY() - actor->spr.pos.XY()).Angle();
goalang = (ps[playernum].GetActor()->opos.XY() - actor->spr.pos.XY()).Angle();
else goalang = (ps[playernum].GetActor()->spr.pos.XY() - actor->spr.pos.XY()).Angle();
angdif = DAngle22_5 * 0.25 * Sgn(deltaangle(actor->spr.angle, goalang).Degrees()); // this looks very wrong...
actor->spr.angle += angdif;

6
source/games/duke/src/actors_r.cpp
View file

@ -3209,7 +3209,7 @@ void move_r(DDukeActor *actor, int pnum, int xvel)
if (a & face_player)
{
if (ps[pnum].newOwner != nullptr)
goalang = (ps[pnum].posoldXY() - actor->spr.pos.XY()).Angle();
goalang = (ps[pnum].GetActor()->opos.XY() - actor->spr.pos.XY()).Angle();
else goalang = (ps[pnum].GetActor()->spr.pos.XY() - actor->spr.pos.XY()).Angle();
angdif = deltaangle(actor->spr.angle, goalang) * 0.25;
if (angdif > -DAngle22_5 / 16 && angdif < nullAngle) angdif = nullAngle;
@ -3222,7 +3222,7 @@ void move_r(DDukeActor *actor, int pnum, int xvel)
if (a & face_player_slow)
{
if (ps[pnum].newOwner != nullptr)
goalang = (ps[pnum].posoldXY() - actor->spr.pos.XY()).Angle();
goalang = (ps[pnum].GetActor()->opos.XY() - actor->spr.pos.XY()).Angle();
else goalang = (ps[pnum].GetActor()->spr.pos.XY() - actor->spr.pos.XY()).Angle();
angdif = DAngle22_5 * 0.25 * Sgn(deltaangle(actor->spr.angle, goalang).Degrees()); // this looks very wrong...
actor->spr.angle += angdif;
@ -3233,7 +3233,7 @@ void move_r(DDukeActor *actor, int pnum, int xvel)
if (a & antifaceplayerslow)
{
if (ps[pnum].newOwner != nullptr)
goalang = ((ps[pnum].posoldXY() - actor->spr.pos.XY()).Angle() + DAngle180);
goalang = ((ps[pnum].GetActor()->opos.XY() - actor->spr.pos.XY()).Angle() + DAngle180);
else goalang = ((ps[pnum].GetActor()->spr.pos.XY() - actor->spr.pos.XY()).Angle() + DAngle180);
angdif = DAngle22_5 * 0.25 * Sgn(deltaangle(actor->spr.angle, goalang).Degrees()); // this looks very wrong...
actor->spr.angle += angdif;

2
source/games/duke/src/game_misc.cpp
View file

@ -279,7 +279,7 @@ void drawoverlays(double interpfrac)
}
else
{
cposxy = pp->posoldXY();
cposxy = pp->GetActor()->opos.XY();
cang = pp->angle.oang;
}
DrawOverheadMap(cposxy, cang, interpfrac);

8
source/games/duke/src/gameexec.cpp
View file

@ -378,13 +378,13 @@ void DoPlayer(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor,
break;
case PLAYER_OPOSX:
if (bSet) ps[iPlayer].posoldX() = lValue * maptoworld;
else SetGameVarID(lVar2, int(ps[iPlayer].posoldX() * (1/maptoworld)), sActor, sPlayer);
if (bSet) ps[iPlayer].GetActor()->opos.X = lValue * maptoworld;
else SetGameVarID(lVar2, int(ps[iPlayer].GetActor()->opos.X * (1/maptoworld)), sActor, sPlayer);
break;
case PLAYER_OPOSY:
if (bSet) ps[iPlayer].posoldY() = lValue * maptoworld;
else SetGameVarID(lVar2, int(ps[iPlayer].posoldY() * (1 / maptoworld)), sActor, sPlayer);
if (bSet) ps[iPlayer].GetActor()->opos.Y = lValue * maptoworld;
else SetGameVarID(lVar2, int(ps[iPlayer].GetActor()->opos.Y * (1 / maptoworld)), sActor, sPlayer);
break;
case PLAYER_OPOSZ:

4
source/games/duke/src/player_d.cpp
View file

@ -153,7 +153,7 @@ static void shootflamethrowerflame(DDukeActor* actor, int p, DVector3 spos, DAng
{
double x;
int j = findplayer(actor, &x);
sang = (ps[j].posoldXY() - spos.XY()).Angle();
sang = (ps[j].GetActor()->opos.XY() - spos.XY()).Angle();
if (actor->spr.picnum == BOSS5)
{
@ -693,7 +693,7 @@ static void shootrpg(DDukeActor *actor, int p, DVector3 pos, DAngle ang, int atw
{
double x;
int j = findplayer(actor, &x);
ang = (ps[j].posoldXY() - pos.XY()).Angle();
ang = (ps[j].GetActor()->opos.XY() - pos.XY()).Angle();
if (actor->spr.picnum == BOSS3)
{
double zoffs = 32;

2
source/games/duke/src/player_r.cpp
View file

@ -613,7 +613,7 @@ static void shootrpg(DDukeActor* actor, int p, DVector3 pos, DAngle ang, int atw
{
double x;
int j = findplayer(actor, &x);
ang = (ps[j].posoldXY() - pos.XY()).Angle();
ang = (ps[j].GetActor()->opos.XY() - pos.XY()).Angle();
if (actor->spr.picnum == BOSS3)
pos.Z -= 32;
else if (actor->spr.picnum == BOSS2)

13
source/games/duke/src/types.h
View file

@ -336,19 +336,6 @@ struct player_struct
}
double& posoldX()
{
return GetActor()->opos.X;
}
double& posoldY()
{
return GetActor()->opos.Y;
}
DVector2& posoldXY()
{
return GetActor()->opos.XY();
}
void posoldZset(const double val)
{
GetActor()->opos.Z = val - GetActor()->viewzoffset;