teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-22 07:21:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- RadialDamage + DimSector

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-23 00:51:32 +01:00
parent 24d4680f6e
commit 6e786fcf1e
2 changed files with 12 additions and 12 deletions
source/games/exhumed/src
object.cppramses.cpp

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

@ -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) {

14
source/games/exhumed/src/ramses.cpp
View file

@ -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;
}