diff options
| author | Tim Angus <tim@ngus.net> | 2007-08-24 00:32:53 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2007-08-24 00:32:53 +0000 |
| commit | d6cbf3366e63e4e4333e49377ee994d26b266a6c (patch) | |
| tree | 18c6488dbd654cb747534fc7a1dcd240be492bdb /src/qcommon/cm_patch.c | |
| parent | 9bb5d25cc24fd678660af34b9b19e21a37f09bd3 (diff) | |
* Merged ioq3-r1133
+ PNG image loader
+ Non-gas dependent x86_64 VM
+ Collision optimisations
+ Slew of other bug fixes
Diffstat (limited to 'src/qcommon/cm_patch.c')
| -rw-r--r-- | src/qcommon/cm_patch.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/qcommon/cm_patch.c b/src/qcommon/cm_patch.c index f262db9c..38b7d5cc 100644 --- a/src/qcommon/cm_patch.c +++ b/src/qcommon/cm_patch.c @@ -1154,7 +1154,7 @@ struct patchCollide_s *CM_GeneratePatchCollide( int width, int height, vec3_t *p if ( width <= 2 || height <= 2 || !points ) { Com_Error( ERR_DROP, "CM_GeneratePatchFacets: bad parameters: (%i, %i, %p)", - width, height, points ); + width, height, (void *)points ); } if ( !(width & 1) || !(height & 1) ) { @@ -1387,6 +1387,11 @@ void CM_TraceThroughPatchCollide( traceWork_t *tw, const struct patchCollide_s * static cvar_t *cv; #endif //BSPC + if ( !BoundsIntersect( tw->bounds[0], tw->bounds[1], + pc->bounds[0], pc->bounds[1] ) ) { + return; + } + if (tw->isPoint) { CM_TracePointThroughPatchCollide( tw, pc ); return; |