From 9cfd56a91209a6a6fa7a3fdf1a28f89be4188259 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Wed, 14 Sep 2022 00:30:08 +0200
Subject: [PATCH] - mathutil is not needed anymore.

---
 source/CMakeLists.txt               |  1 -
 source/build/include/build.h        |  1 -
 source/core/mathutil.cpp            | 64 -----------------------------
 source/core/mathutil.h              |  9 ----
 source/games/duke/src/inlines.h     |  1 -
 source/games/duke/src/sectors_d.cpp |  2 +-
 6 files changed, 1 insertion(+), 77 deletions(-)
 delete mode 100644 source/core/mathutil.cpp
 delete mode 100644 source/core/mathutil.h

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index b2ab0bd04..6dff8b033 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -970,7 +970,6 @@ set (PCH_SOURCES
 	core/automap.cpp
 	core/cheats.cpp
 	core/cheathandler.cpp
-	core/mathutil.cpp
 	core/rts.cpp
 	core/ct_chat.cpp
 	core/d_net.cpp
diff --git a/source/build/include/build.h b/source/build/include/build.h
index 72e1425fc..05ff2638b 100644
--- a/source/build/include/build.h
+++ b/source/build/include/build.h
@@ -31,7 +31,6 @@ EXTERN int sintable[2048];
 #include "buildtiles.h"
 #include "c_cvars.h"
 #include "cmdlib.h"
-#include "mathutil.h"
 
 typedef int64_t coord_t;
 
diff --git a/source/core/mathutil.cpp b/source/core/mathutil.cpp
deleted file mode 100644
index 61725f63b..000000000
--- a/source/core/mathutil.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * mathutil.c
- * Mathematical utility functions to emulate MACT
- *
- * by Jonathon Fowler
- *
- * Since we weren't given the source for MACT386.LIB so I've had to do some
- * creative interpolation here.
- *
- */
-//-------------------------------------------------------------------------
-/*
-Duke Nukem Copyright (C) 1996, 2003 3D Realms Entertainment
-
-This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
-
-Duke Nukem 3D is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-//-------------------------------------------------------------------------
-
-#include <algorithm>
-#include "types.h"
-#include <stdlib.h>
-
-// This extracted from the Rise of the Triad source RT_UTIL.C :-|
-
-int FindDistance2D(int x, int y)
-{
-  x= abs(x);        /* absolute values */
-  y= abs(y);
-
-  if (x<y)
-     std::swap(x,y);
-
-  int t = y + (y>>1);
-
-  return (x - (x>>5) - (x>>7)  + (t>>2) + (t>>6));
-}
-
-double fFindDistance2D(int x, int y)
-{
-  x= abs(x);        /* absolute values */
-  y= abs(y);
-
-  if (x<y)
-     std::swap(x,y);
-
-  double t = y + (y * (1. / 2.));
-
-  return (x - (x * (1. / 32.)) - (x * (1. / 128.))  + (t * (1. / 4.)) + (t * (1. / 64.)));
-}
diff --git a/source/core/mathutil.h b/source/core/mathutil.h
deleted file mode 100644
index 3e3fb9b7d..000000000
--- a/source/core/mathutil.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-int FindDistance2D(int x, int y);
-double fFindDistance2D(int x, int y);
-
-inline int FindDistance2D(const vec2_t& vec)
-{
-	return FindDistance2D(vec.X, vec.Y);
-}
diff --git a/source/games/duke/src/inlines.h b/source/games/duke/src/inlines.h
index fa0e60d94..7465f85cb 100644
--- a/source/games/duke/src/inlines.h
+++ b/source/games/duke/src/inlines.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "mathutil.h"
 #include "gamehud.h"
 #include "global.h"
 
diff --git a/source/games/duke/src/sectors_d.cpp b/source/games/duke/src/sectors_d.cpp
index 881614f87..2ea6cbe95 100644
--- a/source/games/duke/src/sectors_d.cpp
+++ b/source/games/duke/src/sectors_d.cpp
@@ -1627,7 +1627,7 @@ void checksectors_d(int snum)
 			if (p->cursector->lotag == 2)
 			{
 				DDukeActor* hit;
-				double dist = hitasprite(p->GetActor(), &hit);
+				dist = hitasprite(p->GetActor(), &hit);
 				if (hit) near.hitActor = hit;
 				if (dist > 80) near.hitActor = nullptr;