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

Blood: Explosion polymer light

Browse source
This commit is contained in:
nukeykt 2020-01-03 00:17:32 +09:00 committed by Christoph Oelckers
parent 8fbd6674d2
commit 57e925a1bb
2 changed files with 58 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
source/blood/src/actor.cpp
View file

@ -5428,11 +5428,11 @@ void actExplodeSprite(spritetype *pSprite)
return; return;
sfxKill3DSound(pSprite, -1, -1); sfxKill3DSound(pSprite, -1, -1);
evKill(pSprite->index, 3); evKill(pSprite->index, 3);
int nType = 1; int nType = kExplosionStandard;
switch (pSprite->type) switch (pSprite->type)
{ {
case kMissileFireballNapam: case kMissileFireballNapam:
nType = 7; nType = kExplosionNapalm;
seqSpawn(4, 3, nXSprite, -1); seqSpawn(4, 3, nXSprite, -1);
if (Chance(0x8000)) if (Chance(0x8000))
pSprite->cstat |= 4; pSprite->cstat |= 4;
@ -5440,7 +5440,7 @@ void actExplodeSprite(spritetype *pSprite)
GibSprite(pSprite, GIBTYPE_5, NULL, NULL); GibSprite(pSprite, GIBTYPE_5, NULL, NULL);
break; break;
case kMissileFlareAlt: case kMissileFlareAlt:
nType = 3; nType = kExplosionFireball;
seqSpawn(9, 3, nXSprite, -1); seqSpawn(9, 3, nXSprite, -1);
if (Chance(0x8000)) if (Chance(0x8000))
pSprite->cstat |= 4; pSprite->cstat |= 4;
@ -5449,13 +5449,13 @@ void actExplodeSprite(spritetype *pSprite)
break; break;
case kMissileFireballCerberus: case kMissileFireballCerberus:
case kMissileFireballTchernobog: case kMissileFireballTchernobog:
nType = 3; nType = kExplosionFireball;
seqSpawn(5, 3, nXSprite, -1); seqSpawn(5, 3, nXSprite, -1);
sfxPlay3DSound(pSprite, 304, -1, 0); sfxPlay3DSound(pSprite, 304, -1, 0);
GibSprite(pSprite, GIBTYPE_5, NULL, NULL); GibSprite(pSprite, GIBTYPE_5, NULL, NULL);
break; break;
case kThingArmedTNTStick: case kThingArmedTNTStick:
nType = 0; nType = kExplosionSmall;
if (gSpriteHit[nXSprite].florhit == 0) seqSpawn(4,3,nXSprite,-1); if (gSpriteHit[nXSprite].florhit == 0) seqSpawn(4,3,nXSprite,-1);
else seqSpawn(3,3,nXSprite,-1); else seqSpawn(3,3,nXSprite,-1);
sfxPlay3DSound(pSprite, 303, -1, 0); sfxPlay3DSound(pSprite, 303, -1, 0);
@ -5465,7 +5465,7 @@ void actExplodeSprite(spritetype *pSprite)
case kThingArmedRemoteBomb: case kThingArmedRemoteBomb:
case kThingArmedTNTBundle: case kThingArmedTNTBundle:
case kModernThingTNTProx: case kModernThingTNTProx:
nType = 1; nType = kExplosionStandard;
if (gSpriteHit[nXSprite].florhit == 0) if (gSpriteHit[nXSprite].florhit == 0)
seqSpawn(4,3,nXSprite,-1); seqSpawn(4,3,nXSprite,-1);
else else
@ -5474,7 +5474,7 @@ void actExplodeSprite(spritetype *pSprite)
GibSprite(pSprite, GIBTYPE_5, NULL, NULL); GibSprite(pSprite, GIBTYPE_5, NULL, NULL);
break; break;
case kThingArmedSpray: case kThingArmedSpray:
nType = 4; nType = kExplosionSpray;
seqSpawn(5, 3, nXSprite, -1); seqSpawn(5, 3, nXSprite, -1);
sfxPlay3DSound(pSprite, 307, -1, 0); sfxPlay3DSound(pSprite, 307, -1, 0);
GibSprite(pSprite, GIBTYPE_5, NULL, NULL); GibSprite(pSprite, GIBTYPE_5, NULL, NULL);
@ -5491,7 +5491,7 @@ void actExplodeSprite(spritetype *pSprite)
} }
else else
actPostSprite(pSprite->index, kStatFree); actPostSprite(pSprite->index, kStatFree);
nType = 2; nType = kExplosionLarge;
nXSprite = pSprite2->extra; nXSprite = pSprite2->extra;
seqSpawn(4, 3, nXSprite, -1); seqSpawn(4, 3, nXSprite, -1);
sfxPlay3DSound(pSprite2, 305, -1, 0); sfxPlay3DSound(pSprite2, 305, -1, 0);
@ -5534,14 +5534,14 @@ void actExplodeSprite(spritetype *pSprite)
} }
break; break;
case kThingPodFireBall: case kThingPodFireBall:
nType = 3; nType = kExplosionFireball;
seqSpawn(9, 3, nXSprite, -1); seqSpawn(9, 3, nXSprite, -1);
sfxPlay3DSound(pSprite, 307, -1, 0); sfxPlay3DSound(pSprite, 307, -1, 0);
GibSprite(pSprite, GIBTYPE_5, NULL, NULL); GibSprite(pSprite, GIBTYPE_5, NULL, NULL);
sub_746D4(pSprite, 240); sub_746D4(pSprite, 240);
break; break;
default: default:
nType = 1; nType = kExplosionStandard;
seqSpawn(4, 3, nXSprite, -1); seqSpawn(4, 3, nXSprite, -1);
if (Chance(0x8000)) if (Chance(0x8000))
pSprite->cstat |= 4; pSprite->cstat |= 4;
@ -7979,20 +7979,47 @@ void actDoLight(int nSprite)
if (pr_lighting != 1) if (pr_lighting != 1)
return; return;
switch (pSprite->type) switch (pSprite->statnum)
{ {
case kMissileTeslaRegular: case kStatProjectile:
switch (pSprite->type)
{ {
int32_t x = ((sintable[(pSprite->ang+512)&2047])>>6); case kMissileTeslaRegular:
int32_t y = ((sintable[(pSprite->ang)&2047])>>6); {
int32_t x = ((sintable[(pSprite->ang+512)&2047])>>6);
int32_t y = ((sintable[(pSprite->ang)&2047])>>6);
pSprite->x -= x; pSprite->x -= x;
pSprite->y -= y; pSprite->y -= y;
G_AddGameLight(0, nSprite, ((pSprite->yrepeat*tilesiz[pSprite->picnum].y)<<1), 2048, 80+(252<<8)+(120<<16),PR_LIGHT_PRIO_HIGH_GAME); G_AddGameLight(0, nSprite, ((pSprite->yrepeat*tilesiz[pSprite->picnum].y)<<1), 2048, 80+(252<<8)+(120<<16),PR_LIGHT_PRIO_HIGH_GAME);
pSprite->x += x; pSprite->x += x;
pSprite->y += y; pSprite->y += y;
}
break;
}
break;
case kStatExplosion:
switch (pSprite->type)
{
default:
if (!gPolymerLight[nSprite].lightcount)
{
// XXX: This block gets CODEDUP'd too much.
int32_t x = ((sintable[(pSprite->ang+512)&2047])>>6);
int32_t y = ((sintable[(pSprite->ang)&2047])>>6);
pSprite->x -= x;
pSprite->y -= y;
G_AddGameLight(0, nSprite, ((pSprite->yrepeat*tilesiz[pSprite->picnum].y)<<1), LIGHTRAD(spriteNum, pSprite), 240+(160<<8)+(80<<16),
pSprite->yrepeat > 32 ? PR_LIGHT_PRIO_HIGH_GAME : PR_LIGHT_PRIO_LOW_GAME);
pSprite->x += x;
pSprite->y += y;
}
break;
} }
break; break;
} }

12
source/blood/src/common_game.h
View file

@ -153,6 +153,18 @@ kPwUpAsbestArmor = 39,
kMaxPowerUps = 51, kMaxPowerUps = 51,
}; };
enum {
kExplosionSmall = 0,
kExplosionStandard = 1,
kExplosionLarge = 2,
kExplosionFireball = 3,
kExplosionSpray = 4,
kExplosion5 = 5,
kExplosion6 = 6,
kExplosionNapalm = 7,
kExplosionMax = 8
};
// SPRITE TYPES ///////////////////////////////////////////////// // SPRITE TYPES /////////////////////////////////////////////////
enum { enum {
kSpriteDecoration = 0, kSpriteDecoration = 0,