teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Blood: floatified debrisConcuss

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-25 14:16:26 +02:00
parent 549f062973
commit 39d100c970
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5841,7 +5841,7 @@ static void actCheckExplosion()
if (!physactor->insector() || (physactor->spr.flags & kHitagFree) != 0) continue;
if (!CheckSector(sectorMap, physactor) || !CheckProximity(physactor, apos, pSector, radius)) continue;
else debrisConcuss(Owner, i, x, y, z, pExplodeInfo->dmgType);
else debrisConcuss(Owner, i, DVector3(x * inttoworld, y * inttoworld, z * zinttoworld), pExplodeInfo->dmgType);
}
}

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

@ -1568,24 +1568,23 @@ int debrisGetFreeIndex(void)
//
//---------------------------------------------------------------------------
void debrisConcuss(DBloodActor* owneractor, int listIndex, int x, int y, int z, int dmg)
void debrisConcuss(DBloodActor* owneractor, int listIndex, const DVector3& pos, int dmg)
{
DBloodActor* actor = gPhysSpritesList[listIndex];
if (actor != nullptr && actor->hasX())
{
int dx = actor->int_pos().X - x; int dy = actor->int_pos().Y - y; int dz = (actor->int_pos().Z - z) >> 4;
dmg = Scale(0x40000, dmg, 0x40000 + dx * dx + dy * dy + dz * dz);
auto dv = actor->spr.pos - pos;
dmg = int(dmg * (0x4000 / (0x4000 + dv.LengthSquared())));
bool thing = (actor->spr.type >= kThingBase && actor->spr.type < kThingMax);
int size = (tileWidth(actor->spr.picnum) * actor->spr.xrepeat * tileHeight(actor->spr.picnum) * actor->spr.yrepeat) >> 1;
if (actor->xspr.physAttr & kPhysDebrisExplode)
{
if (actor->spriteMass.mass > 0)
{
int t = Scale(dmg, size, actor->spriteMass.mass);
double t = double(dmg) * size / actor->spriteMass.mass;
actor->add_int_bvel_x(MulScale(t, dx, 16));
actor->add_int_bvel_y(MulScale(t, dy, 16));
actor->add_int_bvel_z(MulScale(t, dz, 16));
actor->vel += dv * t / (1 << 24);
}
if (thing)

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

@ -301,7 +301,7 @@ void sfxPlayVectorSound(DBloodActor* pSprite, int vectorId);
int debrisGetFreeIndex(void);
void debrisBubble(DBloodActor* nSprite);
void debrisMove(int listIndex);
void debrisConcuss(DBloodActor* nOwner, int listIndex, int x, int y, int z, int dmg);
void debrisConcuss(DBloodActor* nOwner, int listIndex, const DVector3& pos, int dmg);
// ------------------------------------------------------------------------- //
void aiSetGenIdleState(DBloodActor*);