zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 12:30:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Remove player_struct::posAdd().

Browse source
This commit is contained in:
Mitchell Richters 2022-11-21 13:30:26 +11:00 committed by Christoph Oelckers
parent 27be72c7ec
commit a1e68f88a5
3 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2200,7 +2200,7 @@ void handle_se30(DDukeActor *actor, int JIBS6)
auto psp = ps[p].GetActor(); auto psp = ps[p].GetActor();
if (psp->sector() == actor->sector()) if (psp->sector() == actor->sector())
{ {
ps[p].posAdd(vect); ps[p].GetActor()->spr.pos.XY() += vect;
if (numplayers > 1) if (numplayers > 1)
{ {
@ -2327,7 +2327,7 @@ void handle_se02(DDukeActor* actor)
for (int p = connecthead; p >= 0; p = connectpoint2[p]) for (int p = connecthead; p >= 0; p = connectpoint2[p])
if (ps[p].cursector == actor->sector() && ps[p].on_ground) if (ps[p].cursector == actor->sector() && ps[p].on_ground)
{ {
ps[p].posAdd(vect); ps[p].GetActor()->spr.pos.XY() += vect;
ps[p].bobpos += vect; ps[p].bobpos += vect;
} }
@ -3337,7 +3337,7 @@ void handle_se20(DDukeActor* actor)
for (int p = connecthead; p >= 0; p = connectpoint2[p]) for (int p = connecthead; p >= 0; p = connectpoint2[p])
if (ps[p].cursector == actor->sector() && ps[p].on_ground) if (ps[p].cursector == actor->sector() && ps[p].on_ground)
{ {
ps[p].posAdd(vec); ps[p].GetActor()->spr.pos.XY() += vec;
ps[p].GetActor()->backupvec2(); ps[p].GetActor()->backupvec2();
SetActor(ps[p].GetActor(), ps[p].GetActor()->spr.pos); SetActor(ps[p].GetActor(), ps[p].GetActor()->spr.pos);

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

@ -340,14 +340,6 @@ struct player_struct
{ {
GetActor()->spr.pos = val.plusZ(-GetActor()->viewzoffset); GetActor()->spr.pos = val.plusZ(-GetActor()->viewzoffset);
} }
void posAdd(const DVector3& val)
{
GetActor()->spr.pos += val;
}
void posAdd(const DVector2& val)
{
GetActor()->spr.pos.XY() += val;
}
double& posoldX() double& posoldX()
{ {

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

@ -717,7 +717,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(_DukePlayer, setpos, dukeplayer_setpos)
void dukeplayer_addpos(player_struct* self, double x, double y, double z) void dukeplayer_addpos(player_struct* self, double x, double y, double z)
{ {
self->posAdd({ x, y, z }); self->GetActor()->spr.pos += { x, y, z };
} }
DEFINE_ACTION_FUNCTION_NATIVE(_DukePlayer, addpos, dukeplayer_addpos) DEFINE_ACTION_FUNCTION_NATIVE(_DukePlayer, addpos, dukeplayer_addpos)