From be0eb81c9595ea78a26da1daa3c72fe61c52981b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 13 Sep 2022 23:57:40 +0200 Subject: [PATCH] - deleted unused utilities --- source/games/duke/src/inlines.h | 16 ---------------- source/games/duke/src/player_r.cpp | 2 +- source/games/duke/src/types.h | 10 ---------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/source/games/duke/src/inlines.h b/source/games/duke/src/inlines.h index 869b87989..fa0e60d94 100644 --- a/source/games/duke/src/inlines.h +++ b/source/games/duke/src/inlines.h @@ -94,22 +94,6 @@ inline int checkcursectnums(sectortype* se) return -1; } -inline int ldist(DDukeActor* s1, DDukeActor* s2) -{ - int vx, vy; - vx = s1->int_pos().X - s2->int_pos().X; - vy = s1->int_pos().Y - s2->int_pos().Y; - return(FindDistance2D(vx, vy) + 1); -} - -inline int ldist(const DDukeActor* s1, const tspritetype* s2) -{ - int vx, vy; - vx = s1->int_pos().X - s2->int_pos().X; - vy = s1->int_pos().Y - s2->int_pos().Y; - return(FindDistance2D(vx, vy) + 1); -} - inline bool isIn(int value, int first) { return value == first; diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp index 176b3413d..d4a030c13 100644 --- a/source/games/duke/src/player_r.cpp +++ b/source/games/duke/src/player_r.cpp @@ -857,7 +857,7 @@ static void shootmortar(DDukeActor* actor, int p, const DVector3& pos, DAngle an void shoot_r(DDukeActor* actor, int atwith) { int sa, p; - int sx, sy, sz, vel, zvel, x; + int sx, sy, sz, zvel; auto const sect = actor->sector(); diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h index 75e3e3830..06334292d 100644 --- a/source/games/duke/src/types.h +++ b/source/games/duke/src/types.h @@ -386,16 +386,6 @@ struct player_struct { return { int(pos.X * worldtoint), int(pos.Y * worldtoint), int(pos.Z * zworldtoint) }; } - - vec3_t player_int_opos() const - { - return { int(opos.X * worldtoint), int(opos.Y * worldtoint), int(opos.Z * zworldtoint) }; - } - - void player_add_int_z(int z) - { - pos.Z += z * zinttoworld; - } }; struct Cycler