zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Exhumed: ExplodeEnergyBlock

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-21 09:20:44 +01:00
parent 38d64fc437
commit 9203ca425e
1 changed files with 25 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
source/games/exhumed/src/object.cpp
View file

@ -1691,38 +1691,35 @@ void ExplodeEnergyBlock(DExhumedActor* pActor)
auto pSprite = &pActor->s(); auto pSprite = &pActor->s();
int nSector =pSprite->sectnum; int nSector =pSprite->sectnum;
auto pSector = pSprite->sector();
int startwall = sector[nSector].wallptr; for(auto& wal : wallsofsector(pSector))
int nWalls = sector[nSector].wallnum;
int i;
for (i = 0; i < nWalls; i++)
{ {
int nextwall = wall[startwall + i].nextwall; if (!wal.twoSided()) continue;
auto nextwall = wal.nextWall();
if (wall[nextwall].pal >= 4) { if (nextwall->pal >= 4) {
wall[nextwall].pal = 7; nextwall->pal = 7;
} }
else { else {
wall[nextwall].pal = 0; nextwall->pal = 0;
} }
wall[nextwall].shade = 50; nextwall->shade = 50;
} }
if (sector[nSector].floorpal >= 4) { if (pSector->floorpal >= 4) {
sector[nSector].floorpal = 7; pSector->floorpal = 7;
} }
else { else {
sector[nSector].floorpal = 0; pSector->floorpal = 0;
} }
sector[nSector].floorshade = 50; pSector->floorshade = 50;
sector[nSector].extra = -1; pSector->extra = -1;
sector[nSector].floorz = pSprite->z; pSector->floorz = pSprite->z;
pSprite->z = (pSprite->z + sector[nSector].floorz) / 2; pSprite->z = (pSprite->z + pSector->floorz) / 2;
BuildSpark(pActor, 3); BuildSpark(pActor, 3);
@ -1735,7 +1732,7 @@ void ExplodeEnergyBlock(DExhumedActor* pActor)
nEnergyTowers--; nEnergyTowers--;
for (i = 0; i < 20; i++) for (int i = 0; i < 20; i++)
{ {
pSprite->ang = RandomSize(11); pSprite->ang = RandomSize(11);
BuildSpark(pActor, 1); // shoot out blue orbs BuildSpark(pActor, 1); // shoot out blue orbs
@ -1761,23 +1758,20 @@ void ExplodeEnergyBlock(DExhumedActor* pActor)
lFinaleStart = lFinaleStart + 1; lFinaleStart = lFinaleStart + 1;
} }
for (i = 0; i < numsectors; i++) for(auto& sect : sectors())
{ {
if (sector[i].ceilingpal == 1) { if (sect.ceilingpal == 1) {
sector[i].ceilingpal = 0; sect.ceilingpal = 0;
} }
if (sector[i].floorpal == 1) { if (sect.floorpal == 1) {
sector[i].floorpal = 0; sect.floorpal = 0;
} }
int startwall = sector[i].wallptr; for (auto& wal : wallsofsector(&sect))
int endwall = startwall + sector[i].wallnum; {
if (wal.pal == 1) {
for (int nWall = startwall; nWall < endwall; nWall++) wal.pal = 0;
{
if (wall[nWall].pal == 1) {
wall[nWall].pal = 0;
} }
} }
} }