Skip to content
Permalink
Browse files

Fix 615c3c3.

  • Loading branch information...
enneract committed Aug 28, 2014
1 parent 920d466 commit 1e1171bf0377e1a8522056d982824be6cb6dd410
Showing with 11 additions and 14 deletions.
  1. +8 −11 src/gamelogic/cgame/cg_ents.c
  2. +3 −3 src/gamelogic/cgame/cg_predict.c
@@ -555,7 +555,7 @@ static void CG_Mover( centity_t *cent )
ent.skinNum = ( cg.time >> 6 ) & 1;

// get the model, either as a bmodel or a modelindex
if ( s1->solid == SOLID_BMODEL )
if ( s1->eFlags & SOLID_BMODEL )
{
ent.hModel = cgs.inlineDrawModel[ s1->modelindex ];
}
@@ -1319,7 +1319,6 @@ void CG_AddPacketEntities( void )
{
for ( num = 0; num < cg.snap->numEntities; num++ )
{
float x, zd, zu;
vec3_t mins, maxs;
entityState_t *es;

@@ -1329,17 +1328,15 @@ void CG_AddPacketEntities( void )
switch ( es->eType )
{
case ET_MISSILE:
case ET_CORPSE:
x = ( es->solid & 255 );
zd = ( ( es->solid >> 8 ) & 255 );
zu = ( ( es->solid >> 16 ) & 255 ) - 32;
{
const missileAttributes_t *ma;

mins[ 0 ] = mins[ 1 ] = -x;
maxs[ 0 ] = maxs[ 1 ] = x;
mins[ 2 ] = -zd;
maxs[ 2 ] = zu;
ma = BG_Missile( es->weapon );
mins[ 0 ] = mins[ 1 ] = mins[ 2 ] = -ma->size;
maxs[ 0 ] = maxs[ 1 ] = maxs[ 2 ] = +ma->size;

CG_DrawBoundingBox( cg_drawBBOX.integer, cent->lerpOrigin, mins, maxs );
CG_DrawBoundingBox( cg_drawBBOX.integer, cent->lerpOrigin, mins, maxs );
}
break;

default:
@@ -110,7 +110,7 @@ static void CG_ClipMoveToEntities( const vec3_t start, const vec3_t mins,
const vec3_t maxs, const vec3_t end, int skipNumber,
int mask, int skipmask, trace_t *tr, traceType_t collisionType )
{
int i, x, zd, zu;
int i;
trace_t trace;
entityState_t *ent;
clipHandle_t cmodel;
@@ -325,7 +325,7 @@ int CG_PointContents( const vec3_t point, int passEntityNum )
continue;
}

if ( ent->solid != SOLID_BMODEL ) // special value for bmodel
if ( !( ent->eFlags & EF_BMODEL ) ) // special value for bmodel
{
continue;
}
@@ -446,7 +446,7 @@ static void CG_TouchTriggerPrediction( void )
cent = cg_triggerEntities[ i ];
ent = &cent->currentState;

if ( ent->solid != SOLID_BMODEL )
if ( !( ent->eFlags & EF_BMODEL ) )
{
continue;
}

0 comments on commit 1e1171b

Please sign in to comment.
You can’t perform that action at this time.