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

- Duke: Clean up player/actor accesses in checkhitdefault().

Browse source
This commit is contained in:
Mitchell Richters 2023-10-04 11:21:17 +11:00 committed by Christoph Oelckers
parent 4b410d48ba
commit 2de143214b
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/games/duke/src/sectors.cpp
View file

@ -1476,13 +1476,15 @@ void checkhitdefault(DDukeActor* targ, DDukeActor* proj)
if (targ->spr.statnum == STAT_PLAYER)
{
auto p = targ->PlayerIndex();
if (getPlayer(p)->newOwner != nullptr)
{
getPlayer(p)->newOwner = nullptr;
getPlayer(p)->GetActor()->restoreloc();
const auto p = getPlayer(targ->PlayerIndex());
const auto pact = p->GetActor();
updatesector(getPlayer(p)->GetActor()->getPosWithOffsetZ(), &getPlayer(p)->cursector);
if (p->newOwner != nullptr)
{
p->newOwner = nullptr;
pact->restoreloc();
updatesector(pact->getPosWithOffsetZ(), &p->cursector);
DukeStatIterator it(STAT_ACTOR);
while (auto itActor = it.Next())