teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 21:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified fxSpawnEjectingBrass/Shell and got rid of the inlines.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-28 11:19:14 +02:00
parent ee255b533d
commit 0999ffd5c0
3 changed files with 20 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
source/games/blood/src/fx.cpp
View file

@ -331,22 +331,19 @@ void fxSpawnPodStuff(DBloodActor* actor, int)
//
//---------------------------------------------------------------------------
void fxSpawnEjectingBrass(DBloodActor* actor, int z, int a3, int a4)
void fxSpawnEjectingBrass(DBloodActor* actor, double z, double dist, int a4)
{
int x = actor->int_pos().X + MulScale(actor->native_clipdist() - 4, Cos(actor->int_ang()), 28);
int y = actor->int_pos().Y + MulScale(actor->native_clipdist() - 4, Sin(actor->int_ang()), 28);
x += MulScale(a3, Cos(actor->int_ang() + 512), 30);
y += MulScale(a3, Sin(actor->int_ang() + 512), 30);
auto pBrass = gFX.fxSpawnActor((FX_ID)(FX_37 + Random(3)), actor->sector(), x, y, z, 0);
DVector3 pos(actor->spr.pos.XY() + actor->fClipdist() * actor->spr.angle.ToVector() + (actor->spr.angle + DAngle90).ToVector() * dist, z);
auto pBrass = gFX.fxSpawnActor((FX_ID)(FX_37 + Random(3)), actor->sector(), pos, 0);
if (pBrass)
{
if (!VanillaMode())
pBrass->spr.angle = RandomAngle();
int nDist = (a4 << 18) / 120 + Random2(((a4 / 4) << 18) / 120);
int nAngle = actor->int_ang() + Random2(56) + 512;
pBrass->set_int_bvel_x(MulScale(nDist, Cos(nAngle), 30));
pBrass->set_int_bvel_y(MulScale(nDist, Sin(nAngle), 30));
pBrass->set_int_bvel_z(actor->int_vel().Z - (0x20000 + (Random2(40) << 18) / 120));
double nDist = a4 / 30. + Random2F(((a4 / 4) << 18) / 120, 4);
DAngle nAngle = actor->spr.angle + Random2A(56) + DAngle90;
pBrass->vel.XY() = nAngle.ToVector() * nDist;
pBrass->vel.Z = actor->vel.Z - 2 - Random2(40) / 30.;
}
}
@ -356,22 +353,19 @@ void fxSpawnEjectingBrass(DBloodActor* actor, int z, int a3, int a4)
//
//---------------------------------------------------------------------------
void fxSpawnEjectingShell(DBloodActor* actor, int z, int a3, int a4)
void fxSpawnEjectingShell(DBloodActor* actor, double z, double dist, int a4)
{
int x = actor->int_pos().X + MulScale(actor->native_clipdist() - 4, Cos(actor->int_ang()), 28);
int y = actor->int_pos().Y + MulScale(actor->native_clipdist() - 4, Sin(actor->int_ang()), 28);
x += MulScale(a3, Cos(actor->int_ang() + 512), 30);
y += MulScale(a3, Sin(actor->int_ang() + 512), 30);
auto pShell = gFX.fxSpawnActor((FX_ID)(FX_40 + Random(3)), actor->sector(), x, y, z, 0);
DVector3 pos(actor->spr.pos.XY() + actor->fClipdist() * actor->spr.angle.ToVector() + (actor->spr.angle + DAngle90).ToVector() * dist, z);
auto pShell = gFX.fxSpawnActor((FX_ID)(FX_40 + Random(3)), actor->sector(), pos, 0);
if (pShell)
{
if (!VanillaMode())
pShell->spr.angle = RandomAngle();
int nDist = (a4 << 18) / 120 + Random2(((a4 / 4) << 18) / 120);
int nAngle = actor->int_ang() + Random2(56) + 512;
pShell->set_int_bvel_x(MulScale(nDist, Cos(nAngle), 30));
pShell->set_int_bvel_y(MulScale(nDist, Sin(nAngle), 30));
pShell->set_int_bvel_z(actor->int_vel().Z - (0x20000 + (Random2(20) << 18) / 120));
double nDist = a4 / 30. + Random2F(((a4 / 4) << 18) / 120, 4);
DAngle nAngle = actor->spr.angle + Random2A(56) + DAngle90;
pShell->vel.XY() = nAngle.ToVector() * nDist;
pShell->vel.Z = actor->vel.Z - 2 - Random2(28) / 30.;
}
}

12
source/games/blood/src/fx.h
View file

@ -101,16 +101,8 @@ public:
void fxSpawnBlood(DBloodActor* pSprite, int a2);
void fxSpawnPodStuff(DBloodActor* pSprite, int a2);
void fxSpawnEjectingBrass(DBloodActor* pSprite, int z, int a3, int a4);
inline void fxSpawnEjectingBrassf(DBloodActor* pSprite, double z, int a3, int a4)
{
fxSpawnEjectingBrass(pSprite, z * zworldtoint, a3, a4);
}
void fxSpawnEjectingShell(DBloodActor* pSprite, int z, int a3, int a4);
inline void fxSpawnEjectingShellf(DBloodActor* pSprite, double z, int a3, int a4)
{
fxSpawnEjectingShell(pSprite, z * zworldtoint, a3, a4);
}
void fxSpawnEjectingBrass(DBloodActor* pSprite, double z, int a3, int a4);
void fxSpawnEjectingShell(DBloodActor* pSprite, double z, int a3, int a4);
extern CFX gFX;

4
source/games/blood/src/weapon.cpp
View file

@ -249,7 +249,7 @@ void SpawnBulletEject(PLAYER* pPlayer, int a2, int a3)
POSTURE* pPosture = &pPlayer->pPosture[pPlayer->lifeMode][pPlayer->posture];
pPlayer->zView = pPlayer->actor->spr.pos.Z - pPosture->eyeAboveZ;
double dz = pPlayer->zWeapon - (pPlayer->zWeapon - pPlayer->zView) * 0.5;
fxSpawnEjectingBrassf(pPlayer->actor, dz, a2, a3);
fxSpawnEjectingBrass(pPlayer->actor, dz, a2 * inttoworld, a3);
}
void SpawnShellEject(PLAYER* pPlayer, int a2, int a3)
@ -258,7 +258,7 @@ void SpawnShellEject(PLAYER* pPlayer, int a2, int a3)
pPlayer->zView = pPlayer->actor->spr.pos.Z - pPosture->eyeAboveZ;
double t = pPlayer->zWeapon - pPlayer->zView;
double dz = pPlayer->zWeapon - t + (t * 0.25);
fxSpawnEjectingShellf(pPlayer->actor, dz, a2, a3);
fxSpawnEjectingShell(pPlayer->actor, dz, a2 * inttoworld, a3);
}
//---------------------------------------------------------------------------