diff --git a/source/games/exhumed/src/object.cpp b/source/games/exhumed/src/object.cpp index 7f9373fae..848c0ca36 100644 --- a/source/games/exhumed/src/object.cpp +++ b/source/games/exhumed/src/object.cpp @@ -1774,21 +1774,21 @@ void AIEnergyBlock::RadialDamage(RunListEvent* ev) if (!pActor) return; auto spr = &pActor->s(); - int nSector =spr->sectnum; + auto pSector =spr->sector(); - if (sector[nSector].extra == -1) { + if (pSector->extra == -1) { return; } - int nFloorZ = sector[nSector].floorz; + int nFloorZ = pSector->floorz; - sector[nSector].floorz = spr->z; + pSector->floorz = spr->z; spr->z -= 256; ev->nDamage = runlist_CheckRadialDamage(pActor); // restore previous values - sector[nSector].floorz = nFloorZ; + pSector->floorz = nFloorZ; spr->z += 256; if (ev->nDamage <= 0) { diff --git a/source/games/exhumed/src/ramses.cpp b/source/games/exhumed/src/ramses.cpp index 2b50fd4a6..65c8512c2 100644 --- a/source/games/exhumed/src/ramses.cpp +++ b/source/games/exhumed/src/ramses.cpp @@ -159,21 +159,21 @@ void InitSpiritHead() nTalkTime = 1; } -void DimSector(int nSector) +void DimSector(sectortype* pSector) { - for(auto& wal : wallsofsector(nSector)) + for(auto& wal : wallsofsector(pSector)) { if (wal.shade < 40) { wal.shade++; } } - if (sector[nSector].floorshade < 40) { - sector[nSector].floorshade++; + if (pSector->floorshade < 40) { + pSector->floorshade++; } - if (sector[nSector].ceilingshade < 40) { - sector[nSector].ceilingshade++; + if (pSector->ceilingshade < 40) { + pSector->ceilingshade++; } } @@ -299,7 +299,7 @@ void DoSpiritHead() pSpiritSpr->shade--; if (--dimSectCount < 0) { - DimSector(pSpiritSpr->sectnum); + DimSector(pSpiritSpr->sector()); dimSectCount = 5; }