From 298d029d559bf10388cc6df43c92d7bff8c94b5a Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 26 Sep 2022 23:00:52 +0200 Subject: [PATCH] - found one last place where an integer wrapper was called in actor.cpp --- source/games/blood/src/actor.cpp | 4 ++-- source/games/blood/src/common_game.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/games/blood/src/actor.cpp b/source/games/blood/src/actor.cpp index 55c5483c8..d2fccad4c 100644 --- a/source/games/blood/src/actor.cpp +++ b/source/games/blood/src/actor.cpp @@ -2708,10 +2708,10 @@ static void actNapalmMove(DBloodActor* actor) actor->ZeroVelocity(); for (int i = 0; i < 2; i++) { - int t1 = Random(0x33333) + 0x33333; + double t1 = RandomD(3.2) + 3.2; auto rndang = DAngle::fromBuild(Random2(0x71)); actor->spr.angle = (ang + rndang).Normalized360(); - auto spawned = actFireThing(actor, 0, 0, -0x93d0, kThingNapalmBall, t1); + auto spawned = actFireThing(actor, 0., 0., -0.5774, kThingNapalmBall, t1); spawned->SetOwner(actor->GetOwner()); seqSpawn(61, spawned, nNapalmClient); spawned->xspr.data4 = spawnparam[i]; diff --git a/source/games/blood/src/common_game.h b/source/games/blood/src/common_game.h index d85f40b93..b40db615a 100644 --- a/source/games/blood/src/common_game.h +++ b/source/games/blood/src/common_game.h @@ -548,7 +548,7 @@ inline double RandomF(int a1, int scale = 16) return FixedToFloat(Random(a1), scale); } -inline double RandomD(double val, int scale) +inline double RandomD(double val, int scale = 16) { return FixedToFloat(Random(FloatToFixed(val, scale)), scale); }