From 471f64cf7232cb73ac5ae178e0781e4e3af6b20f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 6 Oct 2022 00:07:01 +0200 Subject: [PATCH] - fixes for player velocity. --- source/games/duke/src/actors_d.cpp | 2 +- source/games/duke/src/actors_r.cpp | 2 +- source/games/duke/src/sectors_d.cpp | 2 +- source/games/duke/src/types.h | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp index 4e344e426..6060a689a 100644 --- a/source/games/duke/src/actors_d.cpp +++ b/source/games/duke/src/actors_d.cpp @@ -1591,7 +1591,7 @@ static void weaponcommon_d(DDukeActor* proj) } } else if (proj->spr.picnum == SPIT) if (proj->vel.Z < 24) - proj->add_int_zvel( gs.gravity - 112); + proj->vel.Z += gs.gravity - 112 / 256.; if (coll.type != 0) { diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp index 983924bc8..ec3cb6387 100644 --- a/source/games/duke/src/actors_r.cpp +++ b/source/games/duke/src/actors_r.cpp @@ -1273,7 +1273,7 @@ static void weaponcommon_r(DDukeActor *proj) } } else if (proj->spr.picnum == SPIT) if (proj->vel.Z < 24) - proj->add_int_zvel( gs.gravity - 112); + proj->vel.Z += gs.gravity - 112/256.; if (coll.type != 0) { diff --git a/source/games/duke/src/sectors_d.cpp b/source/games/duke/src/sectors_d.cpp index e89cc7700..eefe11286 100644 --- a/source/games/duke/src/sectors_d.cpp +++ b/source/games/duke/src/sectors_d.cpp @@ -916,7 +916,7 @@ void checkplayerhurt_d(player_struct* p, const Collision& coll) p->hurt_delay = 16; SetPlayerPal(p, PalEntry(32, 32, 0, 0)); - p->vel.XY() = -p->angle.ang.ToVector() * 16 * VEL_FACTOR; + p->vel.XY() = -p->angle.ang.ToVector() * 16; S_PlayActorSound(DUKE_LONGTERM_PAIN, p->GetActor()); fi.checkhitwall(p->GetActor(), wal, p->pos + p->angle.ang.ToVector() * 2, -1); diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h index c9c20ff5f..f5ff12748 100644 --- a/source/games/duke/src/types.h +++ b/source/games/duke/src/types.h @@ -200,8 +200,6 @@ struct CraneDef TObjPtr poleactor; }; -constexpr double VEL_FACTOR = FloatToFixed<18>(1); -constexpr double VELZ_FACTOR = 256; struct player_struct { DVector3 vel;