r201 - in trunk/code: . cgame client game q3_ui qcommon renderer server ui
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Oct 29 19:13:10 EDT 2005
Author: tma
Date: 2005-10-29 19:13:09 -0400 (Sat, 29 Oct 2005)
New Revision: 201
Removed:
trunk/code/bspc/
trunk/code/splines/
Modified:
trunk/code/cgame/cg_drawtools.c
trunk/code/cgame/cg_main.c
trunk/code/client/cl_console.c
trunk/code/game/bg_lib.c
trunk/code/game/g_main.c
trunk/code/q3_ui/ui_atoms.c
trunk/code/qcommon/cm_patch.c
trunk/code/qcommon/q_math.c
trunk/code/qcommon/q_shared.h
trunk/code/renderer/tr_bsp.c
trunk/code/renderer/tr_curve.c
trunk/code/renderer/tr_shade.c
trunk/code/server/sv_client.c
trunk/code/ui/ui_atoms.c
Log:
* General decrufting:
* Removed Q3_STATIC and associated defines
* Removed MAC_STATIC
* Replaced __LCC__ with Q3_VM
* Removed bspc and splines directories
Modified: trunk/code/cgame/cg_drawtools.c
===================================================================
--- trunk/code/cgame/cg_drawtools.c 2005-10-29 22:06:43 UTC (rev 200)
+++ trunk/code/cgame/cg_drawtools.c 2005-10-29 23:13:09 UTC (rev 201)
@@ -435,8 +435,6 @@
// bk001205 - code below duplicated in q3_ui/ui-atoms.c
// bk001205 - FIXME: does this belong in ui_shared.c?
-// bk001205 - FIXME: HARD_LINKED flags not visible here
-#ifndef Q3_STATIC // bk001205 - q_shared defines not visible here
/*
=================
UI_DrawProportionalString2
@@ -821,4 +819,3 @@
UI_DrawProportionalString2( x, y, str, color, sizeScale, cgs.media.charsetProp );
}
-#endif // Q3STATIC
Modified: trunk/code/cgame/cg_main.c
===================================================================
--- trunk/code/cgame/cg_main.c 2005-10-29 22:06:43 UTC (rev 200)
+++ trunk/code/cgame/cg_main.c 2005-10-29 23:13:09 UTC (rev 201)
@@ -438,9 +438,6 @@
trap_Error( text );
}
-#ifndef CGAME_HARD_LINKED
-// this is only here so the functions in q_shared.c and bg_*.c can link (FIXME)
-
void QDECL Com_Error( int level, const char *error, ... ) {
va_list argptr;
char text[1024];
@@ -463,8 +460,6 @@
CG_Printf ("%s", text);
}
-#endif
-
/*
================
CG_Argv
Modified: trunk/code/client/cl_console.c
===================================================================
--- trunk/code/client/cl_console.c 2005-10-29 22:06:43 UTC (rev 200)
+++ trunk/code/client/cl_console.c 2005-10-29 23:13:09 UTC (rev 201)
@@ -248,7 +248,7 @@
void Con_CheckResize (void)
{
int i, j, width, oldwidth, oldtotallines, numlines, numchars;
- MAC_STATIC short tbuf[CON_TEXTSIZE];
+ short tbuf[CON_TEXTSIZE];
width = (SCREEN_WIDTH / SMALLCHAR_WIDTH) - 2;
Modified: trunk/code/game/bg_lib.c
===================================================================
--- trunk/code/game/bg_lib.c 2005-10-29 22:06:43 UTC (rev 200)
+++ trunk/code/game/bg_lib.c 2005-10-29 23:13:09 UTC (rev 201)
@@ -1257,7 +1257,7 @@
break;
case 'f':
AddFloat( &buf_p, *(double *)arg, width, prec );
-#ifdef __LCC__
+#ifdef Q3_VM
arg += 1; // everything is 32 bit in my compiler
#else
arg += 2;
Modified: trunk/code/game/g_main.c
===================================================================
--- trunk/code/game/g_main.c 2005-10-29 22:06:43 UTC (rev 200)
+++ trunk/code/game/g_main.c 2005-10-29 23:13:09 UTC (rev 201)
@@ -536,9 +536,6 @@
//===================================================================
-#ifndef GAME_HARD_LINKED
-// this is only here so the functions in q_shared.c and bg_*.c can link
-
void QDECL Com_Error ( int level, const char *error, ... ) {
va_list argptr;
char text[1024];
@@ -561,8 +558,6 @@
G_Printf ("%s", text);
}
-#endif
-
/*
========================================================================
Modified: trunk/code/q3_ui/ui_atoms.c
===================================================================
--- trunk/code/q3_ui/ui_atoms.c 2005-10-29 22:06:43 UTC (rev 200)
+++ trunk/code/q3_ui/ui_atoms.c 2005-10-29 23:13:09 UTC (rev 201)
@@ -30,9 +30,6 @@
uiStatic_t uis;
qboolean m_entersound; // after a frame, so caching won't disrupt the sound
-// these are here so the functions in q_shared.c can link
-#ifndef UI_HARD_LINKED
-
void QDECL Com_Error( int level, const char *error, ... ) {
va_list argptr;
char text[1024];
@@ -55,8 +52,6 @@
trap_Print( va("%s", text) );
}
-#endif
-
/*
=================
UI_ClampCvar
Modified: trunk/code/qcommon/cm_patch.c
===================================================================
--- trunk/code/qcommon/cm_patch.c 2005-10-29 22:06:43 UTC (rev 200)
+++ trunk/code/qcommon/cm_patch.c 2005-10-29 23:13:09 UTC (rev 201)
@@ -980,7 +980,7 @@
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 @@
*/
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 ) {
Modified: trunk/code/qcommon/q_math.c
===================================================================
--- trunk/code/qcommon/q_math.c 2005-10-29 22:06:43 UTC (rev 200)
+++ trunk/code/qcommon/q_math.c 2005-10-29 23:13:09 UTC (rev 201)
@@ -153,7 +153,7 @@
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 @@
// 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)
{
Modified: trunk/code/qcommon/q_shared.h
===================================================================
--- trunk/code/qcommon/q_shared.h 2005-10-29 22:06:43 UTC (rev 200)
+++ trunk/code/qcommon/q_shared.h 2005-10-29 23:13:09 UTC (rev 201)
@@ -105,7 +105,7 @@
// 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 @@
#ifdef WIN32
-#define MAC_STATIC
-
#undef QDECL
#define QDECL __cdecl
@@ -184,7 +182,6 @@
#if defined(MACOS_X)
-#define MAC_STATIC
#define __cdecl
#define __declspec(x)
#define stricmp strcasecmp
@@ -239,7 +236,6 @@
#ifdef __MACOS__
#include <MacTypes.h>
-#define MAC_STATIC
#define ID_INLINE inline
#define CPUSTRING "MacOS-PPC"
@@ -266,7 +262,6 @@
// bk001205 - from Makefile
#define stricmp strcasecmp
-#define MAC_STATIC // bk: FIXME
#define ID_INLINE inline
#ifdef __i386__
@@ -291,14 +286,6 @@
#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 @@
#define stricmp strcasecmp
-#define MAC_STATIC
#define ID_INLINE inline
#ifdef __i386__
@@ -364,7 +350,6 @@
// bk001205 - from Makefile
#define stricmp strcasecmp
-#define MAC_STATIC
#define ID_INLINE inline
#ifdef __i386__
@@ -375,14 +360,6 @@
#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 @@
#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 @@
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;
Modified: trunk/code/renderer/tr_bsp.c
===================================================================
--- trunk/code/renderer/tr_bsp.c 2005-10-29 22:06:43 UTC (rev 200)
+++ trunk/code/renderer/tr_bsp.c 2005-10-29 23:13:09 UTC (rev 201)
@@ -135,7 +135,7 @@
static void R_LoadLightmaps( lump_t *l ) {
byte *buf, *buf_p;
int len;
- MAC_STATIC byte image[LIGHTMAP_SIZE*LIGHTMAP_SIZE*4];
+ byte image[LIGHTMAP_SIZE*LIGHTMAP_SIZE*4];
int i, j;
float maxIntensity = 0;
double sumIntensity = 0;
@@ -379,7 +379,7 @@
srfGridMesh_t *grid;
int i, j;
int width, height, numPoints;
- MAC_STATIC drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE];
+ drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE];
int lightmapNum;
vec3_t bounds[2];
vec3_t tmpVec;
Modified: trunk/code/renderer/tr_curve.c
===================================================================
--- trunk/code/renderer/tr_curve.c 2005-10-29 22:06:43 UTC (rev 200)
+++ trunk/code/renderer/tr_curve.c 2005-10-29 23:13:09 UTC (rev 201)
@@ -366,7 +366,7 @@
float len, maxLen;
int dir;
int t;
- MAC_STATIC drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
+ drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
float errorTable[2][MAX_GRID_SIZE];
for ( i = 0 ; i < width ; i++ ) {
@@ -525,7 +525,7 @@
srfGridMesh_t *R_GridInsertColumn( srfGridMesh_t *grid, int column, int row, vec3_t point, float loderror ) {
int i, j;
int width, height, oldwidth;
- MAC_STATIC drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
+ drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
float errorTable[2][MAX_GRID_SIZE];
float lodRadius;
vec3_t lodOrigin;
@@ -579,7 +579,7 @@
srfGridMesh_t *R_GridInsertRow( srfGridMesh_t *grid, int row, int column, vec3_t point, float loderror ) {
int i, j;
int width, height, oldheight;
- MAC_STATIC drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
+ drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
float errorTable[2][MAX_GRID_SIZE];
float lodRadius;
vec3_t lodOrigin;
Modified: trunk/code/renderer/tr_shade.c
===================================================================
--- trunk/code/renderer/tr_shade.c 2005-10-29 22:06:43 UTC (rev 200)
+++ trunk/code/renderer/tr_shade.c 2005-10-29 23:13:09 UTC (rev 201)
@@ -422,7 +422,7 @@
float *texCoords;
byte *colors;
byte clipBits[SHADER_MAX_VERTEXES];
- MAC_STATIC float texCoordsArray[SHADER_MAX_VERTEXES][2];
+ float texCoordsArray[SHADER_MAX_VERTEXES][2];
byte colorArray[SHADER_MAX_VERTEXES][4];
unsigned hitIndexes[SHADER_MAX_INDEXES];
int numIndexes;
Modified: trunk/code/server/sv_client.c
===================================================================
--- trunk/code/server/sv_client.c 2005-10-29 22:06:43 UTC (rev 200)
+++ trunk/code/server/sv_client.c 2005-10-29 23:13:09 UTC (rev 201)
@@ -231,7 +231,7 @@
char userinfo[MAX_INFO_STRING];
int i;
client_t *cl, *newcl;
- MAC_STATIC client_t temp;
+ client_t temp;
sharedEntity_t *ent;
int clientNum;
int version;
Modified: trunk/code/ui/ui_atoms.c
===================================================================
--- trunk/code/ui/ui_atoms.c 2005-10-29 22:06:43 UTC (rev 200)
+++ trunk/code/ui/ui_atoms.c 2005-10-29 23:13:09 UTC (rev 201)
@@ -29,9 +29,6 @@
qboolean m_entersound; // after a frame, so caching won't disrupt the sound
-// these are here so the functions in q_shared.c can link
-#ifndef UI_HARD_LINKED
-
void QDECL Com_Error( int level, const char *error, ... ) {
va_list argptr;
char text[1024];
@@ -54,8 +51,6 @@
trap_Print( va("%s", text) );
}
-#endif
-
qboolean newUI = qfalse;
More information about the quake3-commits
mailing list