zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 17:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

- gib stuff.

Browse source
This commit is contained in:
Christoph Oelckers 2021-08-29 22:22:16 +02:00
parent 344e7e840e
commit 3b1ba88a41
5 changed files with 50 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2740,7 +2740,7 @@ static void actNapalmMove(DBloodActor* actor)
if (pXSprite->data4 > 1)
{
GibSprite(pSprite, GIBTYPE_5, nullptr, nullptr);
GibSprite(actor, GIBTYPE_5, nullptr, nullptr);
int spawnparam[2];
spawnparam[0] = pXSprite->data4 >> 1;
spawnparam[1] = pXSprite->data4 - spawnparam[0];
@ -3023,7 +3023,7 @@ static bool actKillModernDude(DBloodActor* actor, DAMAGE_TYPE damageType)
GetActorExtents(actor, &top, &bottom);
CGibPosition gibPos(pSprite->x, pSprite->y, top);
CGibVelocity gibVel(actor->xvel() >> 1, actor->yvel() >> 1, -0xccccc);
GibSprite(pSprite, nGibType, &gibPos, &gibVel);
GibSprite(actor, nGibType, &gibPos, &gibVel);
}
}
@ -3268,7 +3268,7 @@ static void spawnGibs(DBloodActor* actor, int type, int velz)
GetActorExtents(actor, &top, &bottom);
CGibPosition gibPos(actor->s().x, actor->s().y, top);
CGibVelocity gibVel(actor->xvel() >> 1, actor->yvel() >> 1, velz);
GibSprite(&actor->s(), GIBTYPE_27, &gibPos, &gibVel);
GibSprite(actor, GIBTYPE_27, &gibPos, &gibVel);
}
//---------------------------------------------------------------------------
@ -3319,7 +3319,7 @@ static void burningCultistDeath(DBloodActor* actor, int nSeq)
if (Chance(0x8000))
{
for (int i = 0; i < 3; i++)
GibSprite(pSprite, GIBTYPE_7, nullptr, nullptr);
GibSprite(actor, GIBTYPE_7, nullptr, nullptr);
seqSpawn(dudeInfo[nType].seqStartID + 16 - Random(1), actor, nDudeToGibClient1);
}
else
@ -3652,7 +3652,7 @@ void actKillDude(DBloodActor* killerActor, DBloodActor* actor, DAMAGE_TYPE damag
DUDEINFO* pDudeInfo = getDudeInfo(pSprite->type);
for (int i = 0; i < 3; i++)
if (pDudeInfo->nGibType[i] > -1)
GibSprite(pSprite, (GIBTYPE)pDudeInfo->nGibType[i], nullptr, nullptr);
GibSprite(actor, (GIBTYPE)pDudeInfo->nGibType[i], nullptr, nullptr);
for (int i = 0; i < 4; i++)
fxSpawnBlood(actor, damage);
}
@ -3735,7 +3735,7 @@ static int actDamageThing(DBloodActor* source, DBloodActor* actor, int damage, D
#ifdef NOONE_EXTENSIONS
case kModernThingEnemyLifeLeech:
#endif
GibSprite(pSprite, GIBTYPE_14, nullptr, nullptr);
GibSprite(actor, GIBTYPE_14, nullptr, nullptr);
pXSprite->data1 = pXSprite->data2 = pXSprite->data3 = pXSprite->DudeLockout = 0;
pXSprite->stateTimer = pXSprite->data4 = pXSprite->isTriggered = 0;
@ -3772,7 +3772,7 @@ static int actDamageThing(DBloodActor* source, DBloodActor* actor, int damage, D
case kThingFluorescent:
seqSpawn(12, 3, pSprite->extra, -1);
GibSprite(pSprite, GIBTYPE_6, nullptr, nullptr);
GibSprite(actor, GIBTYPE_6, nullptr, nullptr);
break;
case kThingSpiderWeb:
@ -3781,14 +3781,14 @@ static int actDamageThing(DBloodActor* source, DBloodActor* actor, int damage, D
case kThingMetalGrate:
seqSpawn(21, 3, pSprite->extra, -1);
GibSprite(pSprite, GIBTYPE_4, nullptr, nullptr);
GibSprite(actor, GIBTYPE_4, nullptr, nullptr);
break;
case kThingFlammableTree:
switch (pXSprite->data1)
{
case -1:
GibSprite(pSprite, GIBTYPE_14, nullptr, nullptr);
GibSprite(actor, GIBTYPE_14, nullptr, nullptr);
sfxPlay3DSound(pSprite->x, pSprite->y, pSprite->z, 312, pSprite->sectnum);
actPostSprite(actor, kStatFree);
break;
@ -3955,7 +3955,7 @@ static void actImpactMissile(DBloodActor* missileActor, int hitCode)
}
break;
}
GibSprite(pMissile, GIBTYPE_24, NULL, NULL);
GibSprite(missileActor, GIBTYPE_24, NULL, NULL);
actPostSprite(missileActor, kStatFree);
break;
@ -3973,7 +3973,7 @@ static void actImpactMissile(DBloodActor* missileActor, int hitCode)
case kMissileArcGargoyle:
sfxKill3DSound(pMissile, -1, -1);
sfxPlay3DSound(pMissile->x, pMissile->y, pMissile->z, 306, pMissile->sectnum);
GibSprite(pMissile, GIBTYPE_6, NULL, NULL);
GibSprite(missileActor, GIBTYPE_6, NULL, NULL);
if (hitCode == 3 && pSpriteHit && (pThingInfo || pDudeInfo))
{
@ -4052,7 +4052,7 @@ static void actImpactMissile(DBloodActor* missileActor, int hitCode)
break;
}
}
GibSprite(pMissile, GIBTYPE_17, NULL, NULL);
GibSprite(missileActor, GIBTYPE_17, NULL, NULL);
actPostSprite(missileActor, kStatFree);
break;
@ -4134,7 +4134,7 @@ static void actImpactMissile(DBloodActor* missileActor, int hitCode)
case kMissileTeslaRegular:
sfxKill3DSound(pMissile, -1, -1);
sfxPlay3DSound(pMissile->x, pMissile->y, pMissile->z, 518, pMissile->sectnum);
GibSprite(pMissile, (hitCode == 2) ? GIBTYPE_23 : GIBTYPE_22, NULL, NULL);
GibSprite(missileActor, (hitCode == 2) ? GIBTYPE_23 : GIBTYPE_22, NULL, NULL);
evKillActor(missileActor);
seqKill(missileActor);
actPostSprite(missileActor, kStatFree);
@ -5507,7 +5507,7 @@ void actExplodeSprite(DBloodActor* actor)
seqSpawn(4, actor, -1);
if (Chance(0x8000)) pSprite->cstat |= 4;
sfxPlay3DSound(actor, 303, -1, 0);
GibSprite(pSprite, GIBTYPE_5, nullptr, nullptr);
GibSprite(actor, GIBTYPE_5, nullptr, nullptr);
break;
case kMissileFlareAlt:
@ -5515,7 +5515,7 @@ void actExplodeSprite(DBloodActor* actor)
seqSpawn(9, actor, -1);
if (Chance(0x8000)) pSprite->cstat |= 4;
sfxPlay3DSound(actor, 306, 24 + (pSprite->index & 3), FX_GlobalChannel); // ouch...
GibSprite(pSprite, GIBTYPE_5, nullptr, nullptr);
GibSprite(actor, GIBTYPE_5, nullptr, nullptr);
break;
case kMissileFireballCerberus:
@ -5523,7 +5523,7 @@ void actExplodeSprite(DBloodActor* actor)
nType = kExplosionFireball;
seqSpawn(5, actor, -1);
sfxPlay3DSound(actor, 304, -1, 0);
GibSprite(pSprite, GIBTYPE_5, nullptr, nullptr);
GibSprite(actor, GIBTYPE_5, nullptr, nullptr);
break;
case kThingArmedTNTStick:
@ -5531,7 +5531,7 @@ void actExplodeSprite(DBloodActor* actor)
if (actor->hit.florhit.type == kHitNone) seqSpawn(4, actor, -1);
else seqSpawn(3, actor, -1);
sfxPlay3DSound(actor, 303, -1, 0);
GibSprite(pSprite, GIBTYPE_5, nullptr, nullptr);
GibSprite(actor, GIBTYPE_5, nullptr, nullptr);
break;
case kThingArmedProxBomb:
@ -5545,14 +5545,14 @@ void actExplodeSprite(DBloodActor* actor)
else
seqSpawn(3, actor, -1);
sfxPlay3DSound(actor, 304, -1, 0);
GibSprite(pSprite, GIBTYPE_5, nullptr, nullptr);
GibSprite(actor, GIBTYPE_5, nullptr, nullptr);
break;
case kThingArmedSpray:
nType = kExplosionSpray;
seqSpawn(5, actor, -1);
sfxPlay3DSound(actor, 307, -1, 0);
GibSprite(pSprite, GIBTYPE_5, nullptr, nullptr);
GibSprite(actor, GIBTYPE_5, nullptr, nullptr);
break;
case kThingTNTBarrel:
@ -5573,7 +5573,7 @@ void actExplodeSprite(DBloodActor* actor)
pXSprite = &spawned->x();
sfxPlay3DSound(actor, 305, -1, 0);
GibSprite(pSprite, GIBTYPE_14, nullptr, nullptr);
GibSprite(actor, GIBTYPE_14, nullptr, nullptr);
break;
}
case kTrapExploder:
@ -5613,7 +5613,7 @@ void actExplodeSprite(DBloodActor* actor)
nType = kExplosionFireball;
seqSpawn(9, actor, -1);
sfxPlay3DSound(actor, 307, -1, 0);
GibSprite(pSprite, GIBTYPE_5, nullptr, nullptr);
GibSprite(actor, GIBTYPE_5, nullptr, nullptr);
fxSpawnPodStuff(actor, 240);
break;
@ -5622,7 +5622,7 @@ void actExplodeSprite(DBloodActor* actor)
seqSpawn(4, actor, -1);
if (Chance(0x8000)) pSprite->cstat |= 4;
sfxPlay3DSound(actor, 303, -1, 0);
GibSprite(pSprite, GIBTYPE_5, nullptr, nullptr);
GibSprite(actor, GIBTYPE_5, nullptr, nullptr);
break;
}
actor->xvel() = actor->yvel() = actor->zvel() = 0;
@ -5656,9 +5656,9 @@ void actActivateGibObject(DBloodActor* actor)
int sound = pXSprite->data4;
int dropmsg = pXSprite->dropMsg;
if (gib1 > 0) GibSprite(pSprite, (GIBTYPE)(gib1 - 1), nullptr, nullptr);
if (gib2 > 0) GibSprite(pSprite, (GIBTYPE)(gib2 - 1), nullptr, nullptr);
if (gib3 > 0 && pXSprite->burnTime > 0) GibSprite(pSprite, (GIBTYPE)(gib3 - 1), nullptr, nullptr);
if (gib1 > 0) GibSprite(actor, (GIBTYPE)(gib1 - 1), nullptr, nullptr);
if (gib2 > 0) GibSprite(actor, (GIBTYPE)(gib2 - 1), nullptr, nullptr);
if (gib3 > 0 && pXSprite->burnTime > 0) GibSprite(actor, (GIBTYPE)(gib3 - 1), nullptr, nullptr);
if (sound > 0) sfxPlay3DSound(pSprite->x, pSprite->y, pSprite->z, sound, pSprite->sectnum);
if (dropmsg > 0) actDropObject(actor, dropmsg);
@ -6326,7 +6326,7 @@ void actCheckFlares()
auto pXTarget = target->hasX() ? &target->x() : nullptr;
if (pTarget->statnum == kMaxStatus)
{
GibSprite(pSprite, GIBTYPE_17, NULL, NULL);
GibSprite(actor, GIBTYPE_17, NULL, NULL);
actPostSprite(actor, kStatFree);
}
if (pXTarget && pXTarget->health > 0)
@ -6342,7 +6342,7 @@ void actCheckFlares()
}
else
{
GibSprite(pSprite, GIBTYPE_17, NULL, NULL);
GibSprite(actor, GIBTYPE_17, NULL, NULL);
actPostSprite(actor, kStatFree);
}
}

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

@ -2599,7 +2599,7 @@ void genDudePostDeath(DBloodActor* actor, DAMAGE_TYPE damageType, int damage)
DUDEINFO* pDudeInfo = getDudeInfo(pSprite->type);
for (int i = 0; i < 3; i++)
if (pDudeInfo->nGibType[i] > -1)
GibSprite(pSprite, (GIBTYPE)pDudeInfo->nGibType[i], NULL, NULL);
GibSprite(actor, (GIBTYPE)pDudeInfo->nGibType[i], NULL, NULL);
for (int i = 0; i < 4; i++)
fxSpawnBlood(actor, damage);

24
source/games/blood/src/gib.cpp
View file

@ -283,8 +283,9 @@ int ChanceToCount(int a1, int a2)
return vb;
}
void GibFX(spritetype *pSprite, GIBFX *pGFX, CGibPosition *pPos, CGibVelocity *pVel)
void GibFX(DBloodActor* actor, GIBFX *pGFX, CGibPosition *pPos, CGibVelocity *pVel)
{
spritetype* pSprite = &actor->s();
int nSector = pSprite->sectnum;
if (adult_lockout && gGameOptions.nGameType == 0 && pGFX->fxId == FX_13)
return;
@ -297,7 +298,7 @@ void GibFX(spritetype *pSprite, GIBFX *pGFX, CGibPosition *pPos, CGibVelocity *p
int dz1 = floorZ-gPos.z;
int dz2 = gPos.z-ceilZ;
int top, bottom;
GetSpriteExtents(pSprite, &top, &bottom);
GetActorExtents(actor, &top, &bottom);
for (int i = 0; i < nCount; i++)
{
if (!pPos && (pSprite->cstat&48) == 0)
@ -350,8 +351,9 @@ void GibFX(spritetype *pSprite, GIBFX *pGFX, CGibPosition *pPos, CGibVelocity *p
}
}
void GibThing(spritetype *pSprite, GIBTHING *pGThing, CGibPosition *pPos, CGibVelocity *pVel)
void GibThing(DBloodActor* actor, GIBTHING *pGThing, CGibPosition *pPos, CGibVelocity *pVel)
{
spritetype* pSprite = &actor->s();
if (adult_lockout && gGameOptions.nGameType <= 0)
switch (pGThing->type) {
case kThingBloodBits:
@ -363,7 +365,7 @@ void GibThing(spritetype *pSprite, GIBTHING *pGThing, CGibPosition *pPos, CGibVe
{
int nSector = pSprite->sectnum;
int top, bottom;
GetSpriteExtents(pSprite, &top, &bottom);
GetActorExtents(actor, &top, &bottom);
int x, y, z;
if (!pPos)
{
@ -422,24 +424,25 @@ void GibThing(spritetype *pSprite, GIBTHING *pGThing, CGibPosition *pPos, CGibVe
}
}
void GibSprite(spritetype *pSprite, GIBTYPE nGibType, CGibPosition *pPos, CGibVelocity *pVel)
void GibSprite(DBloodActor* actor, GIBTYPE nGibType, CGibPosition *pPos, CGibVelocity *pVel)
{
assert(pSprite != NULL);
assert(actor != NULL);
assert(nGibType >= 0 && nGibType < kGibMax);
if (pSprite->sectnum < 0 || pSprite->sectnum >= numsectors)
if (actor->s().sectnum < 0 || actor->s().sectnum >= numsectors)
return;
GIBLIST *pGib = &gibList[nGibType];
for (int i = 0; i < pGib->Kills; i++)
{
GIBFX *pGibFX = &pGib->gibFX[i];
assert(pGibFX->chance > 0);
GibFX(pSprite, pGibFX, pPos, pVel);
GibFX(actor, pGibFX, pPos, pVel);
}
for (int i = 0; i < pGib->atc; i++)
{
GIBTHING *pGibThing = &pGib->at8[i];
assert(pGibThing->chance > 0);
GibThing(pSprite, pGibThing, pPos, pVel);
GibThing(actor, pGibThing, pPos, pVel);
}
}
@ -481,6 +484,7 @@ void GibWall(int nWall, GIBTYPE nGibType, CGibVelocity *pVel)
assert(nGibType >= 0 && nGibType < kGibMax);
int cx, cy, cz, wx, wy, wz;
walltype *pWall = &wall[nWall];
cx = (pWall->x+wall[pWall->point2].x)>>1;
cy = (pWall->y+wall[pWall->point2].y)>>1;
int nSector = sectorofwall(nWall);
@ -488,12 +492,14 @@ void GibWall(int nWall, GIBTYPE nGibType, CGibVelocity *pVel)
getzsofslope(nSector, cx, cy, &ceilZ, &floorZ);
int32_t ceilZ2, floorZ2;
getzsofslope(pWall->nextsector, cx, cy, &ceilZ2, &floorZ2);
ceilZ = ClipLow(ceilZ, ceilZ2);
floorZ = ClipHigh(floorZ, floorZ2);
wz = floorZ-ceilZ;
wx = wall[pWall->point2].x-pWall->x;
wy = wall[pWall->point2].y-pWall->y;
cz = (ceilZ+floorZ)>>1;
GIBLIST *pGib = &gibList[nGibType];
sfxPlay3DSound(cx, cy, cz, pGib->at10, nSector);
for (int i = 0; i < pGib->Kills; i++)

3
source/games/blood/src/gib.h
View file

@ -71,7 +71,6 @@ public:
CGibVelocity(int _vx, int _vy, int _vz) : vx(_vx), vy(_vy), vz(_vz) {}
};
void GibSprite(spritetype *pSprite, GIBTYPE nGibType, CGibPosition *pPos, CGibVelocity *pVel);
//void GibFX(int nWall, GIBFX * pGFX, int a3, int a4, int a5, int a6, CGibVelocity * pVel);
void GibSprite(DBloodActor *pSprite, GIBTYPE nGibType, CGibPosition *pPos, CGibVelocity *pVel);
void GibWall(int nWall, GIBTYPE nGibType, CGibVelocity *pVel);
END_BLD_NS

12
source/games/blood/src/player.cpp
View file

@ -1962,8 +1962,8 @@ int playerDamageSprite(DBloodActor* source, PLAYER *pPlayer, DAMAGE_TYPE nDamage
sfxPlay3DSound(pSprite, 716, 0, 0);
break;
case kDamageExplode:
GibSprite(pSprite, GIBTYPE_7, NULL, NULL);
GibSprite(pSprite, GIBTYPE_15, NULL, NULL);
GibSprite(pActor, GIBTYPE_7, NULL, NULL);
GibSprite(pActor, GIBTYPE_15, NULL, NULL);
pPlayer->pSprite->cstat |= 32768;
nDeathSeqID = 17;
break;
@ -1973,8 +1973,8 @@ int playerDamageSprite(DBloodActor* source, PLAYER *pPlayer, DAMAGE_TYPE nDamage
GetSpriteExtents(pSprite, &top, &bottom);
CGibPosition gibPos(pSprite->x, pSprite->y, top);
CGibVelocity gibVel(xvel[pSprite->index]>>1, yvel[pSprite->index]>>1, -0xccccc);
GibSprite(pSprite, GIBTYPE_27, &gibPos, &gibVel);
GibSprite(pSprite, GIBTYPE_7, NULL, NULL);
GibSprite(pActor, GIBTYPE_27, &gibPos, &gibVel);
GibSprite(pActor, GIBTYPE_7, NULL, NULL);
fxSpawnBlood(pActor, nDamage<<4);
fxSpawnBlood(pActor, nDamage<<4);
nDeathSeqID = 17;
@ -2022,8 +2022,8 @@ int playerDamageSprite(DBloodActor* source, PLAYER *pPlayer, DAMAGE_TYPE nDamage
{
case kDamageExplode:
sfxPlay3DSound(pSprite, 717, 0, 0);
GibSprite(pSprite, GIBTYPE_7, NULL, NULL);
GibSprite(pSprite, GIBTYPE_15, NULL, NULL);
GibSprite(pActor, GIBTYPE_7, NULL, NULL);
GibSprite(pActor, GIBTYPE_15, NULL, NULL);
pPlayer->pSprite->cstat |= 32768;
nDeathSeqID = 2;
break;