zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-27 13:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- prepareboard cleanup

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-12 21:00:48 +01:00
parent a33c655033
commit 1e27f067ad
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
source/games/whaven/src/whmap.cpp
View file

@ -250,21 +250,21 @@ boolean prepareboard(const char* fname) {
lavadrylandcnt = 0; lavadrylandcnt = 0;
aiInit(); aiInit();
for (i = 0; i < MAXSPRITES; i++) { // setup sector effect options WHLinearSpriteIterator it;
if (sprite[i].statnum >= MAXSTATUS) while (auto actor = it.Next())
continue; {
SPRITE& spr = actor->s();
SPRITE& spr = sprite[i]; i = actor->GetSpriteIndex();
if(!isWh2() && mapon == 5 && i == 0 && spr.lotag == 0 && spr.hitag == 0) { if(!isWh2() && mapon == 5 && i == 0 && spr.lotag == 0 && spr.hitag == 0) {
spr.lotag = 1; spr.lotag = 1;
spr.hitag = 34; spr.hitag = 34;
} }
if (sprite[i].picnum == CONE) { if (spr.picnum == CONE) {
sparksx = sprite[i].x; sparksx = spr.x;
sparksy = sprite[i].y; sparksy = spr.y;
sparksz = sprite[i].z; sparksz = spr.z;
for (int j = 0; j < 10; j++) { for (int j = 0; j < 10; j++) {
makesparks(i, 1); makesparks(i, 1);
} }
@ -274,14 +274,14 @@ boolean prepareboard(const char* fname) {
for (int j = 20; j < 30; j++) { for (int j = 20; j < 30; j++) {
makesparks(i, 3); makesparks(i, 3);
} }
sprite[i].cstat &= ~3; spr.cstat &= ~3;
sprite[i].cstat |= 0x8000; spr.cstat |= 0x8000;
sprite[i].clipdist = 4; spr.clipdist = 4;
changespritestat(i, (short) 0); ChangeActorStat(actor, 0);
sector[sprite[i].sectnum].lotag = 50; sector[spr.sectnum].lotag = 50;
sector[sprite[i].sectnum].hitag = sprite[i].hitag; sector[spr.sectnum].hitag = spr.hitag;
if (sector[sprite[i].sectnum].hitag == 0) if (sector[spr.sectnum].hitag == 0)
sector[sprite[i].sectnum].hitag = 1; sector[spr.sectnum].hitag = 1;
} }
if ((spr.cstat & (16 + 32)) == (16 + 32)) if ((spr.cstat & (16 + 32)) == (16 + 32))
@ -299,15 +299,15 @@ boolean prepareboard(const char* fname) {
if (spr.picnum == TORCH) { if (spr.picnum == TORCH) {
spr.cstat &= ~3; spr.cstat &= ~3;
changespritestat(i, TORCHLIGHT); ChangeActorStat(actor, TORCHLIGHT);
} }
if (spr.picnum == STANDINTORCH || spr.picnum == BOWLOFFIRE) { if (spr.picnum == STANDINTORCH || spr.picnum == BOWLOFFIRE) {
changespritestat(i, TORCHLIGHT); ChangeActorStat(actor, TORCHLIGHT);
} }
if (spr.picnum == GLOW) { if (spr.picnum == GLOW) {
changespritestat(i, GLOWLIGHT); ChangeActorStat(actor, GLOWLIGHT);
} }
if (spr.picnum == SNDEFFECT) { if (spr.picnum == SNDEFFECT) {