|
|
@ -2286,14 +2286,14 @@ static void pfnTraceModel( const float *v1, const float *v2, int hullNumber, edi |
|
|
|
pent->v.movetype = MOVETYPE_PUSH; |
|
|
|
pent->v.movetype = MOVETYPE_PUSH; |
|
|
|
pent->v.solid = SOLID_BSP; |
|
|
|
pent->v.solid = SOLID_BSP; |
|
|
|
|
|
|
|
|
|
|
|
SV_ClipMoveToEntity( pent, v1, mins, maxs, v2, &trace ); |
|
|
|
SV_ClipMoveToEntity( pent, v1, mins, maxs, v2, &trace ); |
|
|
|
|
|
|
|
|
|
|
|
pent->v.movetype = oldmovetype; |
|
|
|
pent->v.movetype = oldmovetype; |
|
|
|
pent->v.solid = oldsolid; |
|
|
|
pent->v.solid = oldsolid; |
|
|
|
} |
|
|
|
} |
|
|
|
else |
|
|
|
else |
|
|
|
{ |
|
|
|
{ |
|
|
|
SV_ClipMoveToEntity( pent, v1, mins, maxs, v2, &trace ); |
|
|
|
SV_ClipMoveToEntity( pent, v1, mins, maxs, v2, &trace ); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
SV_ConvertTrace( ptr, &trace ); |
|
|
|
SV_ConvertTrace( ptr, &trace ); |
|
|
@ -2368,7 +2368,7 @@ void pfnGetAimVector( edict_t* ent, float speed, float *rgflReturn ) |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
|
|
if( FBitSet( check->v.flags, FL_FAKECLIENT )) |
|
|
|
if( FBitSet( check->v.flags, FL_FAKECLIENT )) |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
|
|
if( ent->v.team > 0 && ent->v.team == check->v.team ) |
|
|
|
if( ent->v.team > 0 && ent->v.team == check->v.team ) |
|
|
|
continue; |
|
|
|
continue; |
|
|
@ -4006,7 +4006,7 @@ void SV_PlaybackEventFull( int flags, const edict_t *pInvoker, word eventindex, |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if( !FBitSet( flags, FEV_GLOBAL ) && VectorIsNull( pvspoint )) |
|
|
|
if( !FBitSet( flags, FEV_GLOBAL ) && VectorIsNull( pvspoint )) |
|
|
|
{ |
|
|
|
{ |
|
|
|
Con_DPrintf( S_ERROR "%s: not a FEV_GLOBAL event missing origin. Ignored.\n", sv.event_precache[eventindex] ); |
|
|
|
Con_DPrintf( S_ERROR "%s: not a FEV_GLOBAL event missing origin. Ignored.\n", sv.event_precache[eventindex] ); |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
@ -5053,7 +5053,7 @@ qboolean SV_LoadProgs( const char *name ) |
|
|
|
if( !GetEntityAPI && !GetEntityAPI2 ) |
|
|
|
if( !GetEntityAPI && !GetEntityAPI2 ) |
|
|
|
{ |
|
|
|
{ |
|
|
|
COM_FreeLibrary( svgame.hInstance ); |
|
|
|
COM_FreeLibrary( svgame.hInstance ); |
|
|
|
Con_Printf( S_ERROR "SV_LoadProgs: failed to get address of GetEntityAPI proc\n" ); |
|
|
|
Con_Printf( S_ERROR "SV_LoadProgs: failed to get address of GetEntityAPI proc\n" ); |
|
|
|
svgame.hInstance = NULL; |
|
|
|
svgame.hInstance = NULL; |
|
|
|
Mem_FreePool(&svgame.mempool); |
|
|
|
Mem_FreePool(&svgame.mempool); |
|
|
|
return false; |
|
|
|
return false; |
|
|
|