zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Guard macros.h by #ifndef/#define, remove two decls of nonexistent functions. 

In jmact/mathutil.h: FindDistance3D_HP() and ArcTangentAppx().

git-svn-id: https://svn.eduke32.com/eduke32@3224 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-11-25 13:18:36 +00:00
parent 8d2599cba1
commit 50b6e4acac
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
polymer/eduke32/source/jmact/mathutil.h
View File

@ -32,8 +32,6 @@ Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
extern int32_t FindDistance2D(int32_t dx, int32_t dy);
extern int32_t FindDistance3D(int32_t dx, int32_t dy, int32_t dz);
extern int32_t FindDistance3D_HP(int32_t dx, int32_t dy, int32_t dz);
extern int32_t ArcTangentAppx(int32_t dx, int32_t dy);
#ifdef EXTERNC
}

4
polymer/eduke32/source/macros.h
View File

@ -20,6 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
//-------------------------------------------------------------------------
#ifndef EDUKE32_MACROS_H_
#define EDUKE32_MACROS_H_
// Macros, some from SW source
#define ALT_IS_PRESSED ( KB_KeyPressed( sc_RightAlt ) || KB_KeyPressed( sc_LeftAlt ) )
@ -206,3 +209,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define T8 actor[i].t_data[7]
#define T9 actor[i].t_data[8]
#endif

5
polymer/eduke32/source/sounds_mapster32.c
View File

@ -32,11 +32,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "osd.h"
#include "cache1d.h"
#include "macros.h"
#include "mathutil.h"
#include "build.h" // vec3_t
#include "editor.h"
#include "macros.h"
#include "mathutil.h"
#ifdef WIN32
#include "winlayer.h"
#endif