nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-02-01 05:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't try to use pvs on heightmaps where there is no pvs

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4505 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2013-10-19 10:29:33 +00:00
parent 6aeb900e90
commit 224cd87ade
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
engine/server/pr_cmds.c
View file

@ -3197,6 +3197,7 @@ static void QCBUILTIN PF_TraceToss (pubprogfuncs_t *prinst, struct globalvars_s
qbyte checkpvsbuffer[MAX_MAP_LEAFS/8];
qbyte *checkpvs;
vec3_t checkorg;
int PF_newcheckclient (pubprogfuncs_t *prinst, int check)
{
@ -3204,7 +3205,6 @@ int PF_newcheckclient (pubprogfuncs_t *prinst, int check)
// qbyte *pvs;
edict_t *ent;
int leaf;
vec3_t org;
// cycle to the next one
@ -3240,9 +3240,14 @@ int PF_newcheckclient (pubprogfuncs_t *prinst, int check)
}
// get the PVS for the entity
VectorAdd (ent->v->origin, ent->v->view_ofs, org);
leaf = sv.world.worldmodel->funcs.LeafnumForPoint(sv.world.worldmodel, org);
checkpvs = sv.world.worldmodel->funcs.LeafPVS (sv.world.worldmodel, leaf, checkpvsbuffer, sizeof(checkpvsbuffer));
VectorAdd (ent->v->origin, ent->v->view_ofs, checkorg);
if (sv.world.worldmodel->type == mod_heightmap)
checkpvs = NULL;
else
{
leaf = sv.world.worldmodel->funcs.LeafnumForPoint(sv.world.worldmodel, checkorg);
checkpvs = sv.world.worldmodel->funcs.LeafPVS (sv.world.worldmodel, leaf, checkpvsbuffer, sizeof(checkpvsbuffer));
}
return i;
}
@ -3269,6 +3274,7 @@ int PF_checkclient_Internal (pubprogfuncs_t *prinst)
edict_t *ent, *self;
int l;
vec3_t view;
vec3_t dist;
world_t *w = &sv.world;
// find a new check if on a new frame
@ -3288,11 +3294,19 @@ int PF_checkclient_Internal (pubprogfuncs_t *prinst)
// if current entity can't possibly see the check entity, return 0
self = PROG_TO_EDICT(prinst, pr_global_struct->self);
VectorAdd (self->v->origin, self->v->view_ofs, view);
l = w->worldmodel->funcs.LeafnumForPoint(w->worldmodel, view)-1;
if ( (l<0) || !(checkpvs[l>>3] & (1<<(l&7)) ) )
{
c_notvis++;
VectorSubtract(view, checkorg, dist);
if (DotProduct(dist, dist) > 2048*2048)
return 0;
if (checkpvs)
{
l = w->worldmodel->funcs.LeafnumForPoint(w->worldmodel, view)-1;
if ( (l<0) || !(checkpvs[l>>3] & (1<<(l&7)) ) )
{
c_notvis++;
return 0;
}
}
// might be able to see it