vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix collision being calculated on unlagged value for both players and bots.

Browse source
This commit is contained in:
Alibek Omarov 2018-05-03 17:43:26 +03:00
parent 5ca7bb5f12
commit 46a3e729db
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
engine/server/sv_pmove.c
View file

@ -67,17 +67,19 @@ qboolean SV_CopyEdictToPhysEnt( physent_t *pe, edict_t *ed )
VectorCopy( ed->v.origin, pe->origin ); VectorCopy( ed->v.origin, pe->origin );
VectorCopy( ed->v.angles, pe->angles ); VectorCopy( ed->v.angles, pe->angles );
if( FBitSet( ed->v.flags, FL_FAKECLIENT )) if( FBitSet( ed->v.flags, FL_CLIENT ))
{
// bot
Q_strncpy( pe->name, "bot", sizeof( pe->name ));
pe->player = pe->info;
}
else if( FBitSet( ed->v.flags, FL_CLIENT ))
{ {
// client // client
SV_GetTrueOrigin( &svs.clients[pe->info - 1], pe->info, pe->origin ); SV_GetTrueOrigin( &svs.clients[pe->info - 1], pe->info, pe->origin );
Q_strncpy( pe->name, "player", sizeof( pe->name )); if( FBitSet( ed->v.flags, FL_FAKECLIENT )) // fakeclients have client flag too
{
// bot
Q_strncpy( pe->name, "bot", sizeof( pe->name ));
}
else
{
Q_strncpy( pe->name, "player", sizeof( pe->name ));
}
pe->player = pe->info; pe->player = pe->info;
} }
else else
@ -177,7 +179,7 @@ void SV_GetTrueOrigin( sv_client_t *cl, int edictnum, vec3_t origin )
return; return;
if( svgame.interp[edictnum-1].active && svgame.interp[edictnum-1].moving ) if( svgame.interp[edictnum-1].active && svgame.interp[edictnum-1].moving )
VectorCopy( svgame.interp[edictnum-1].newpos, origin ); VectorCopy( svgame.interp[edictnum-1].oldpos, origin );
} }
void SV_GetTrueMinMax( sv_client_t *cl, int edictnum, vec3_t mins, vec3_t maxs ) void SV_GetTrueMinMax( sv_client_t *cl, int edictnum, vec3_t mins, vec3_t maxs )