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

- replaced old refactoring wrapper.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-12 00:50:04 +02:00
parent 088699f5c8
commit 9426f42f41
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2817,7 +2817,7 @@ void handle_se14(DDukeActor* actor, bool checkstat, int RPG, int JIBS6)
updatesector(ps[p].pos, &sect);
if ((sect == nullptr && ud.clipping == 0) || (sect == actor->sector() && ps[p].cursector != actor->sector()))
{
ps[p].getxyfromactor(actor);
ps[p].pos.XY() = actor->spr.pos.XY();
ps[p].setCursector(actor->sector());
SetActor(ps[p].GetActor(), actor->spr.pos);
@ -2892,7 +2892,7 @@ void handle_se14(DDukeActor* actor, bool checkstat, int RPG, int JIBS6)
updatesector(ps[p].pos, &k);
if ((k == nullptr && ud.clipping == 0) || (k == actor->sector() && ps[p].cursector != actor->sector()))
{
ps[p].getxyfromactor(actor);
ps[p].pos.XY() = actor->spr.pos.XY();
ps[p].backupxy();
ps[p].setCursector(actor->sector());
@ -2995,7 +2995,7 @@ void handle_se30(DDukeActor *actor, int JIBS6)
updatesector(ps[p].pos, &k);
if ((k == nullptr && ud.clipping == 0) || (k == actor->sector() && ps[p].cursector != actor->sector()))
{
ps[p].getxyfromactor(actor);
ps[p].pos.XY() = actor->spr.pos.XY();
ps[p].setCursector(actor->sector());
SetActor(ps[p].GetActor(), actor->spr.pos);
@ -3051,7 +3051,7 @@ void handle_se30(DDukeActor *actor, int JIBS6)
updatesector(ps[p].pos, &k);
if ((k == nullptr && ud.clipping == 0) || (k == actor->sector() && ps[p].cursector != actor->sector()))
{
ps[p].getxyfromactor(actor);
ps[p].pos.XY() = actor->spr.pos.XY();
ps[p].backupxy();
ps[p].setCursector(actor->sector());

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

@ -388,12 +388,6 @@ struct player_struct
if (addz) pos.Z += addz;
}
void getxyfromactor(DCoreActor* actor)
{
pos.X = actor->spr.pos.X;
pos.Y = actor->spr.pos.Y;
}
vec3_t player_int_pos() const
{
return { int(pos.X * worldtoint), int(pos.Y * worldtoint), int(pos.Z * zworldtoint) };