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

- SE14 part 4

Browse source
This commit is contained in:
Christoph Oelckers 2020-11-01 08:00:43 +01:00
parent 1cffc76c4e
commit 1b6161d472
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2972,20 +2972,22 @@ void handle_se14(int i, bool checkstat, int RPG, int JIBS6)
} }
} }
SectIterator itr(sprite[s->owner].sectnum); auto Owner = actor->GetOwner();
while ((j = itr.NextIndex()) >= 0) if (Owner)
{ {
auto spj = &sprite[j]; DukeSectIterator itr(Owner->s.sectnum);
while (auto a2 = itr.Next())
if (spj->statnum == 1 && badguy(spj) && spj->picnum != SECTOREFFECTOR && spj->picnum != LOCATORS)
{ {
short k = spj->sectnum; if (a2->s.statnum == 1 && badguy(a2) && a2->s.picnum != SECTOREFFECTOR && a2->s.picnum != LOCATORS)
updatesector(spj->x, spj->y, &k);
if (spj->extra >= 0 && k == s->sectnum)
{ {
fi.gutsdir(&sprite[j], JIBS6, 72, myconnectindex); short k = a2->s.sectnum;
S_PlayActorSound(SQUISHED, i); updatesector(a2->s.x, a2->s.y, &k);
deletesprite(j); if (a2->s.extra >= 0 && k == s->sectnum)
{
fi.gutsdir(&a2->s, JIBS6, 72, myconnectindex);
S_PlayActorSound(SQUISHED, actor);
deletesprite(a2);
}
} }
} }
} }