zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 04:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

- debris functions.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-13 00:46:21 +02:00
parent 6e2f8ec47f
commit 942e93b2e7
3 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/blood/src/actor.cpp
View file

@ -6046,7 +6046,7 @@ static void actCheckExplosion()
if (pDebris->sectnum < 0 || (pDebris->flags & kHitagFree) != 0) continue; if (pDebris->sectnum < 0 || (pDebris->flags & kHitagFree) != 0) continue;
if (!TestBitString(sectormap, pDebris->sectnum) || !CheckProximity(pDebris, x, y, z, nSector, radius)) continue; if (!TestBitString(sectormap, pDebris->sectnum) || !CheckProximity(pDebris, x, y, z, nSector, radius)) continue;
else debrisConcuss(Owner ? Owner->s().index : -1, i, x, y, z, pExplodeInfo->dmgType); else debrisConcuss(Owner, i, x, y, z, pExplodeInfo->dmgType);
} }
} }

29
source/games/blood/src/nnexts.cpp
View file

@ -1444,11 +1444,11 @@ void nnExtProcessSuperSprites()
if ((uwater = spriteIsUnderwater(debrisactor)) == false) evKillActor(debrisactor, kCallbackEnemeyBubble); if ((uwater = spriteIsUnderwater(debrisactor)) == false) evKillActor(debrisactor, kCallbackEnemeyBubble);
else if (Chance(0x1000 - mass)) else if (Chance(0x1000 - mass))
{ {
if (debrisactor->zvel() > 0x100) debrisBubble(nDebris); if (debrisactor->zvel() > 0x100) debrisBubble(debrisactor);
if (ang == pXDebris->goalAng) if (ang == pXDebris->goalAng)
{ {
pXDebris->goalAng = (pDebris->ang + Random3(kAng60)) & 2047; pXDebris->goalAng = (pDebris->ang + Random3(kAng60)) & 2047;
debrisBubble(nDebris); debrisBubble(debrisactor);
} }
} }
@ -1658,9 +1658,8 @@ int debrisGetFreeIndex(void)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void debrisConcuss(int nOwner, int listIndex, int x, int y, int z, int dmg) void debrisConcuss(DBloodActor* owner, int listIndex, int x, int y, int z, int dmg)
{ {
auto owner = &bloodActors[nOwner];
auto actor = gPhysSpritesList[listIndex]; auto actor = gPhysSpritesList[listIndex];
if (actor != nullptr && actor->hasX()) if (actor != nullptr && actor->hasX())
{ {
@ -1669,14 +1668,15 @@ void debrisConcuss(int nOwner, int listIndex, int x, int y, int z, int dmg)
dmg = scale(0x40000, dmg, 0x40000 + dx * dx + dy * dy + dz * dz); dmg = scale(0x40000, dmg, 0x40000 + dx * dx + dy * dy + dz * dz);
bool thing = (pSprite->type >= kThingBase && pSprite->type < kThingMax); bool thing = (pSprite->type >= kThingBase && pSprite->type < kThingMax);
int size = (tileWidth(pSprite->picnum) * pSprite->xrepeat * tileHeight(pSprite->picnum) * pSprite->yrepeat) >> 1; int size = (tileWidth(pSprite->picnum) * pSprite->xrepeat * tileHeight(pSprite->picnum) * pSprite->yrepeat) >> 1;
if (xsprite[pSprite->extra].physAttr & kPhysDebrisExplode) { if (xsprite[pSprite->extra].physAttr & kPhysDebrisExplode)
{
if (actor->spriteMass.mass > 0) if (actor->spriteMass.mass > 0)
{ {
int t = scale(dmg, size, actor->spriteMass.mass); int t = scale(dmg, size, actor->spriteMass.mass);
xvel[pSprite->index] += MulScale(t, dx, 16); actor->xvel() += MulScale(t, dx, 16);
yvel[pSprite->index] += MulScale(t, dy, 16); actor->yvel() += MulScale(t, dy, 16);
zvel[pSprite->index] += MulScale(t, dz, 16); actor->zvel() += MulScale(t, dz, 16);
} }
if (thing) if (thing)
@ -1696,11 +1696,10 @@ void debrisConcuss(int nOwner, int listIndex, int x, int y, int z, int dmg)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void debrisBubble(int nSprite) void debrisBubble(DBloodActor* actor)
{ {
spritetype* pSprite = &actor->s();
spritetype* pSprite = &sprite[nSprite];
int top, bottom; int top, bottom;
GetSpriteExtents(pSprite, &top, &bottom); GetSpriteExtents(pSprite, &top, &bottom);
for (unsigned int i = 0; i < 1 + Random(5); i++) { for (unsigned int i = 0; i < 1 + Random(5); i++) {
@ -1712,15 +1711,15 @@ void debrisBubble(int nSprite)
int z = bottom - Random(bottom - top); int z = bottom - Random(bottom - top);
auto pFX = gFX.fxSpawnActor((FX_ID)(FX_23 + Random(3)), pSprite->sectnum, x, y, z, 0); auto pFX = gFX.fxSpawnActor((FX_ID)(FX_23 + Random(3)), pSprite->sectnum, x, y, z, 0);
if (pFX) { if (pFX) {
pFX->xvel() = xvel[nSprite] + Random2(0x1aaaa); pFX->xvel() = actor->xvel() + Random2(0x1aaaa);
pFX->yvel() = yvel[nSprite] + Random2(0x1aaaa); pFX->yvel() = actor->yvel() + Random2(0x1aaaa);
pFX->zvel() = zvel[nSprite] + Random2(0x1aaaa); pFX->zvel() = actor->zvel() + Random2(0x1aaaa);
} }
} }
if (Chance(0x2000)) if (Chance(0x2000))
evPostActor(&bloodActors[nSprite], 0, kCallbackEnemeyBubble); evPostActor(actor, 0, kCallbackEnemeyBubble);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

4
source/games/blood/src/nnexts.h
View file

@ -304,9 +304,9 @@ void sfxPlayMissileSound(DBloodActor* pSprite, int missileId);
void sfxPlayVectorSound(DBloodActor* pSprite, int vectorId); void sfxPlayVectorSound(DBloodActor* pSprite, int vectorId);
// ------------------------------------------------------------------------- // // ------------------------------------------------------------------------- //
int debrisGetFreeIndex(void); int debrisGetFreeIndex(void);
void debrisBubble(int nSprite); void debrisBubble(DBloodActor* nSprite);
void debrisMove(int listIndex); void debrisMove(int listIndex);
void debrisConcuss(int nOwner, int listIndex, int x, int y, int z, int dmg); void debrisConcuss(DBloodActor* nOwner, int listIndex, int x, int y, int z, int dmg);
// ------------------------------------------------------------------------- // // ------------------------------------------------------------------------- //
void aiSetGenIdleState(spritetype* pSprite, XSPRITE* pXSprite); void aiSetGenIdleState(spritetype* pSprite, XSPRITE* pXSprite);