zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 04:24:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Move player_struct::restorexyz() to DCoreActor::restorepos().

Browse source
This commit is contained in:
Mitchell Richters 2022-11-20 19:03:27 +11:00 committed by Christoph Oelckers
parent a78d976352
commit 6eeedbd38a
7 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/core/coreactor.h
View file

@ -139,6 +139,12 @@ public:
backupang(); backupang();
} }
void restorepos()
{
spr.pos = opos;
viewzoffset = oviewzoffset;
}
sectortype* sector() const sectortype* sector() const
{ {
return spr.sectp; return spr.sectp;

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

@ -203,7 +203,7 @@ void checkavailweapon(player_struct* player)
void clearcamera(player_struct* ps) void clearcamera(player_struct* ps)
{ {
ps->newOwner = nullptr; ps->newOwner = nullptr;
ps->restorexyz(); ps->GetActor()->restorepos();
ps->angle.restore(); ps->angle.restore();
updatesector(ps->posGet(), &ps->cursector); updatesector(ps->posGet(), &ps->cursector);

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

@ -1734,7 +1734,7 @@ static void greenslime(DDukeActor *actor)
if (ps[p].newOwner != nullptr) if (ps[p].newOwner != nullptr)
{ {
ps[p].newOwner = nullptr; ps[p].newOwner = nullptr;
ps[p].restorexyz(); ps[p].GetActor()->restorepos();
ps[p].angle.restore(); ps[p].angle.restore();
updatesector(ps[p].posGet(), &ps[p].cursector); updatesector(ps[p].posGet(), &ps[p].cursector);

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

@ -2045,7 +2045,7 @@ int ParseState::parse(void)
if(!isRR() && ps[g_p].newOwner != nullptr) if(!isRR() && ps[g_p].newOwner != nullptr)
{ {
ps[g_p].newOwner = nullptr; ps[g_p].newOwner = nullptr;
ps[g_p].restorexyz(); ps[g_p].GetActor()->restorepos();
ps[g_p].angle.restore(); ps[g_p].angle.restore();
updatesector(ps[g_p].posGet(), &ps[g_p].cursector); updatesector(ps[g_p].posGet(), &ps[g_p].cursector);

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

@ -1061,7 +1061,7 @@ void checkhitdefault_d(DDukeActor* targ, DDukeActor* proj)
if (ps[p].newOwner != nullptr) if (ps[p].newOwner != nullptr)
{ {
ps[p].newOwner = nullptr; ps[p].newOwner = nullptr;
ps[p].restorexyz(); ps[p].GetActor()->restorepos();
ps[p].angle.restore(); ps[p].angle.restore();
updatesector(ps[p].posGet(), &ps[p].cursector); updatesector(ps[p].posGet(), &ps[p].cursector);
@ -1411,7 +1411,7 @@ void checkhitsprite_d(DDukeActor* targ, DDukeActor* proj)
void clearcameras(player_struct* p) void clearcameras(player_struct* p)
{ {
p->restorexyz(); p->GetActor()->restorepos();
p->newOwner = nullptr; p->newOwner = nullptr;
updatesector(p->posGet(), &p->cursector); updatesector(p->posGet(), &p->cursector);

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

@ -1544,7 +1544,7 @@ void checkhitdefault_r(DDukeActor* targ, DDukeActor* proj)
if (ps[p].newOwner != nullptr) if (ps[p].newOwner != nullptr)
{ {
ps[p].newOwner = nullptr; ps[p].newOwner = nullptr;
ps[p].restorexyz(); ps[p].GetActor()->restorepos();
updatesector(ps[p].posGet(), &ps[p].cursector); updatesector(ps[p].posGet(), &ps[p].cursector);

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

@ -330,11 +330,6 @@ struct player_struct
return cursector != nullptr; return cursector != nullptr;
} }
void restorexyz()
{
GetActor()->spr.pos = GetActor()->opos;
}
void backupxy() void backupxy()
{ {
GetActor()->opos.X = GetActor()->spr.pos.X; GetActor()->opos.X = GetActor()->spr.pos.X;