zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-01 14:11:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- handle_st25.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-23 19:16:39 +02:00
parent fd8ee214f5
commit d4c53226d0
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -852,30 +852,32 @@ static void handle_st23(int sn, DDukeActor* actor)
static void handle_st25(int sn, DDukeActor* actor) static void handle_st25(int sn, DDukeActor* actor)
{ {
StatIterator it(STAT_EFFECTOR); DukeStatIterator it(STAT_EFFECTOR);
int i, j; DDukeActor* act2;
while ((j = it.NextIndex()) >= 0) while ((act2 = it.Next()))
{ {
if ((sprite[j].lotag) == 15 && sprite[j].sectnum == sn) if (act2->s.lotag == 15 && act2->s.sectnum == sn)
break; //Found the sectoreffector. {
break;
}
} }
if (j < 0) if (act2 == nullptr)
return; return;
it.Reset(STAT_EFFECTOR); it.Reset(STAT_EFFECTOR);
while ((i = it.NextIndex()) >= 0) while (auto act3 = it.Next())
{ {
if (sprite[i].hitag == sprite[j].hitag) if (act3->s.hitag == act2->s.hitag)
{ {
if (sprite[i].lotag == 15) if (act3->s.lotag == 15)
{ {
sector[sprite[i].sectnum].lotag ^= 0x8000; // Toggle the open or close sector[act3->s.sectnum].lotag ^= 0x8000; // Toggle the open or close
sprite[i].ang += 1024; act3->s.ang += 1024;
if (hittype[i].temp_data[4]) callsound(sprite[i].sectnum, i); if (act3->temp_data[4]) callsound(act3->s.sectnum, act3);
callsound(sprite[i].sectnum, i); callsound(act3->s.sectnum, act3);
if (sector[sprite[i].sectnum].lotag & 0x8000) hittype[i].temp_data[4] = 1; if (sector[act3->s.sectnum].lotag & 0x8000) act3->temp_data[4] = 1;
else hittype[i].temp_data[4] = 2; else act3->temp_data[4] = 2;
} }
} }
} }