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

- mathutil is not needed anymore.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-14 00:30:08 +02:00
parent ebb7442370
commit 9cfd56a912
6 changed files with 1 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/CMakeLists.txt
View file

@ -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

1
source/build/include/build.h
View file

@ -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;

64
source/core/mathutil.cpp
View file

@ -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.)));
}

9
source/core/mathutil.h
View file

@ -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);
}

1
source/games/duke/src/inlines.h
View file

@ -1,6 +1,5 @@
#pragma once
#include "mathutil.h"
#include "gamehud.h"
#include "global.h"

2
source/games/duke/src/sectors_d.cpp
View file

@ -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;