diff options
| author | Tim Angus <tim@ngus.net> | 2007-09-05 22:05:32 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2007-09-05 22:05:32 +0000 |
| commit | c99975c73ae2941751d86d3b8466454c5ad122c0 (patch) | |
| tree | b5bb65655fbdbc22201426046092939bcf696abe /src/qcommon/cm_trace.c | |
| parent | 27ad2c0e19891f7f2454c9eedf76878dc1942ba6 (diff) | |
* Merge of ioq3-r1163
+ SDL everywhere
+ New R_LoadImage
+ net_ip.c
+ Window icon
+ GUI based dedicated server support
+ Compile time linked OpenGL
* Remove ui_menuFiles cvar
Diffstat (limited to 'src/qcommon/cm_trace.c')
| -rw-r--r-- | src/qcommon/cm_trace.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/qcommon/cm_trace.c b/src/qcommon/cm_trace.c index c40e1013..bd8d4bd5 100644 --- a/src/qcommon/cm_trace.c +++ b/src/qcommon/cm_trace.c @@ -42,7 +42,7 @@ BASIC MATH RotatePoint ================ */ -void RotatePoint(vec3_t point, /*const*/ vec3_t matrix[3]) { // bk: FIXME +void RotatePoint(vec3_t point, /*const*/ vec3_t matrix[3]) { // FIXME vec3_t tvec; VectorCopy(point, tvec); @@ -56,7 +56,7 @@ void RotatePoint(vec3_t point, /*const*/ vec3_t matrix[3]) { // bk: FIXME TransposeMatrix ================ */ -void TransposeMatrix(/*const*/ vec3_t matrix[3], vec3_t transpose[3]) { // bk: FIXME +void TransposeMatrix(/*const*/ vec3_t matrix[3], vec3_t transpose[3]) { // FIXME int i, j; for (i = 0; i < 3; i++) { for (j = 0; j < 3; j++) { @@ -1269,17 +1269,6 @@ void CM_TraceThroughTree( traceWork_t *tw, int num, float p1f, float p2f, vec3_t if ( tw->isPoint ) { offset = 0; } else { -#if 0 // bk010201 - DEAD - // an axial brush right behind a slanted bsp plane - // will poke through when expanded, so adjust - // by sqrt(3) - offset = fabs(tw->extents[0]*plane->normal[0]) + - fabs(tw->extents[1]*plane->normal[1]) + - fabs(tw->extents[2]*plane->normal[2]); - - offset *= 2; - offset = tw->maxOffset; -#endif // this is silly offset = 2048; } @@ -1479,7 +1468,7 @@ void CM_Trace( trace_t *results, const vec3_t start, // if (start[0] == end[0] && start[1] == end[1] && start[2] == end[2]) { if ( model ) { -#ifdef ALWAYS_BBOX_VS_BBOX // bk010201 - FIXME - compile time flag? +#ifdef ALWAYS_BBOX_VS_BBOX // FIXME - compile time flag? if ( model == BOX_MODEL_HANDLE || model == CAPSULE_MODEL_HANDLE) { tw.type = TT_AABB; CM_TestInLeaf( &tw, &cmod->leaf ); |