From ce25a7def5dc658d78c06016494b90972f1cf973 Mon Sep 17 00:00:00 2001 From: tma Date: Sat, 29 Oct 2005 23:13:09 +0000 Subject: * General decrufting: * Removed Q3_STATIC and associated defines * Removed MAC_STATIC * Replaced __LCC__ with Q3_VM * Removed bspc and splines directories git-svn-id: svn://svn.icculus.org/quake3/trunk@201 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/qcommon/cm_patch.c | 4 ++-- code/qcommon/q_math.c | 4 ++-- code/qcommon/q_shared.h | 29 +++-------------------------- 3 files changed, 7 insertions(+), 30 deletions(-) (limited to 'code/qcommon') diff --git a/code/qcommon/cm_patch.c b/code/qcommon/cm_patch.c index fd0cd4c..6fe9a75 100644 --- a/code/qcommon/cm_patch.c +++ b/code/qcommon/cm_patch.c @@ -980,7 +980,7 @@ CM_PatchCollideFromGrid static void CM_PatchCollideFromGrid( cGrid_t *grid, patchCollide_t *pf ) { int i, j; float *p1, *p2, *p3; - MAC_STATIC int gridPlanes[MAX_GRID_SIZE][MAX_GRID_SIZE][2]; + int gridPlanes[MAX_GRID_SIZE][MAX_GRID_SIZE][2]; facet_t *facet; int borders[4]; int noAdjust[4]; @@ -1147,7 +1147,7 @@ Points is packed as concatenated rows. */ struct patchCollide_s *CM_GeneratePatchCollide( int width, int height, vec3_t *points ) { patchCollide_t *pf; - MAC_STATIC cGrid_t grid; + cGrid_t grid; int i, j; if ( width <= 2 || height <= 2 || !points ) { diff --git a/code/qcommon/q_math.c b/code/qcommon/q_math.c index 4c35730..da3044e 100644 --- a/code/qcommon/q_math.c +++ b/code/qcommon/q_math.c @@ -153,7 +153,7 @@ float Q_crandom( int *seed ) { return 2.0 * ( Q_random( seed ) - 0.5 ); } -#ifdef __LCC__ +#ifdef Q3_VM int VectorCompare( const vec3_t v1, const vec3_t v2 ) { if (v1[0] != v2[0] || v1[1] != v2[1] || v1[2] != v2[2]) { @@ -739,7 +739,7 @@ int BoxOnPlaneSide2 (vec3_t emins, vec3_t emaxs, struct cplane_s *p) // if not GNU x86 and configured to use asm #if !( (defined __GNUC__) && (defined __i386__) && (!defined C_ONLY)) -#if defined __LCC__ || defined C_ONLY || !id386 || defined __VECTORC +#if defined Q3_VM || defined C_ONLY || !id386 || defined __VECTORC int BoxOnPlaneSide (vec3_t emins, vec3_t emaxs, struct cplane_s *p) { diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h index 08d4c23..39b4973 100644 --- a/code/qcommon/q_shared.h +++ b/code/qcommon/q_shared.h @@ -105,7 +105,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // this is the define for determining if we have an asm version of a C function -#if (defined _M_IX86 || defined __i386__) && !defined __sun && !defined __LCC__ +#if (defined _M_IX86 || defined __i386__) && !defined __sun && !defined Q3_VM #define id386 1 #else #define id386 0 @@ -135,8 +135,6 @@ float FloatSwap (const float *f); #ifdef WIN32 -#define MAC_STATIC - #undef QDECL #define QDECL __cdecl @@ -184,7 +182,6 @@ static ID_INLINE float BigFloat(const float l) { return FloatSwap(&l); } #if defined(MACOS_X) -#define MAC_STATIC #define __cdecl #define __declspec(x) #define stricmp strcasecmp @@ -239,7 +236,6 @@ static inline float LittleFloat (const float l) { return FloatSwap(&l); } #ifdef __MACOS__ #include -#define MAC_STATIC #define ID_INLINE inline #define CPUSTRING "MacOS-PPC" @@ -266,7 +262,6 @@ static inline float LittleFloat (const float l) { return FloatSwap(&l); } // bk001205 - from Makefile #define stricmp strcasecmp -#define MAC_STATIC // bk: FIXME #define ID_INLINE inline #ifdef __i386__ @@ -291,14 +286,6 @@ static inline float LittleFloat (const float l) { return FloatSwap(&l); } #define PATH_SEP '/' -// bk001205 - try -#ifdef Q3_STATIC -#define GAME_HARD_LINKED -#define CGAME_HARD_LINKED -#define UI_HARD_LINKED -#define BOTLIB_HARD_LINKED -#endif - #if __FLOAT_WORD_ORDER == __LITTLE_ENDIAN inline static short BigShort( short l) { return ShortSwap(l); } #define LittleShort @@ -322,7 +309,6 @@ inline static float LittleFloat (const float l) { return FloatSwap(&l); } #define stricmp strcasecmp -#define MAC_STATIC #define ID_INLINE inline #ifdef __i386__ @@ -364,7 +350,6 @@ static float LittleFloat (const float l) { return FloatSwap(&l); } // bk001205 - from Makefile #define stricmp strcasecmp -#define MAC_STATIC #define ID_INLINE inline #ifdef __i386__ @@ -375,14 +360,6 @@ static float LittleFloat (const float l) { return FloatSwap(&l); } #define PATH_SEP '/' -// bk001205 - try -#ifdef Q3_STATIC -#define GAME_HARD_LINKED -#define CGAME_HARD_LINKED -#define UI_HARD_LINKED -#define BOTLIB_HARD_LINKED -#endif - #if defined(_LITTLE_ENDIAN) inline static short BigShort( short l) { return ShortSwap(l); } #define LittleShort @@ -703,7 +680,7 @@ void ByteToDir( int b, vec3_t dir ); #endif -#ifdef __LCC__ +#ifdef Q3_VM #ifdef VectorCopy #undef VectorCopy // this is a little hack to get more efficient copies in our interpreter @@ -738,7 +715,7 @@ float RadiusFromBounds( const vec3_t mins, const vec3_t maxs ); void ClearBounds( vec3_t mins, vec3_t maxs ); void AddPointToBounds( const vec3_t v, vec3_t mins, vec3_t maxs ); -#ifndef __LCC__ +#ifndef Q3_VM static ID_INLINE int VectorCompare( const vec3_t v1, const vec3_t v2 ) { if (v1[0] != v2[0] || v1[1] != v2[1] || v1[2] != v2[2]) { return 0; -- cgit v1.2.3