teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-19 15:40:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Blood: floatified actCheckTraps

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-25 21:52:02 +02:00
parent 8d1938b363
commit fc011e847f
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5902,28 +5902,22 @@ static void actCheckTraps()
case kTrapFlame: case kTrapFlame:
if (actor->xspr.state && seqGetStatus(actor) < 0) if (actor->xspr.state && seqGetStatus(actor) < 0)
{ {
int x = actor->int_pos().X; auto pos = actor->spr.pos;
int y = actor->int_pos().Y; double t = actor->xspr.data1 * (128. / 120.);
int z = actor->int_pos().Z; auto vec = actor->spr.angle.ToVector() * t;
int t = (actor->xspr.data1 << 23) / 120;
int dx = MulScale(t, Cos(actor->int_ang()), 30);
int dy = MulScale(t, Sin(actor->int_ang()), 30);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
auto pFX = gFX.fxSpawnActor(FX_32, actor->sector(), x, y, z, 0); auto pFX = gFX.fxSpawnActor(FX_32, actor->sector(), pos, 0);
if (pFX) if (pFX)
{ {
pFX->set_int_bvel_x(dx + Random2(0x8888)); pFX->vel.X = vec.X + Random2F(0x8888);
pFX->set_int_bvel_y(dy + Random2(0x8888)); pFX->vel.Y = vec.Y + Random2F(0x8888);
pFX->vel.Z = Random2F(0x8888); pFX->vel.Z = Random2F(0x8888);
} }
x += (dx / 2) >> 12; pos += vec / 2;
y += (dy / 2) >> 12;
} }
dy = bsin(actor->int_ang());
dx = bcos(actor->int_ang());
gVectorData[kVectorTchernobogBurn].maxDist = actor->xspr.data1 << 9; gVectorData[kVectorTchernobogBurn].maxDist = actor->xspr.data1 << 9;
actFireVector(actor, 0, 0, dx, dy, Random2(0x8888), kVectorTchernobogBurn); actFireVector(actor, 0., 0., DVector3(actor->spr.angle.ToVector(), Random2F(0x8888) * 4), kVectorTchernobogBurn);
} }
break; break;
} }