okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* General decrufting:

Browse source 
* Removed Q3_STATIC and associated defines
* Removed MAC_STATIC
* Replaced __LCC__ with Q3_VM
* Removed bspc and splines directories
This commit is contained in:
Tim Angus 2005-10-29 23:13:09 +00:00
parent 63fdc74843
commit c41483634c
116 changed files with 16 additions and 48383 deletions
Download patch file Download diff file Expand all files Collapse all files

4
code/qcommon/cm_patch.c
View file

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

4
code/qcommon/q_math.c
View file

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

29
code/qcommon/q_shared.h
View file

@ -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 <MacTypes.h>
#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;