team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nullarea stuff was inconsistent. This was breaking areaportals.

This commit is contained in:
Shpoike 2021-05-02 18:25:28 +01:00
parent ff9495fcf7
commit c1e320116d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/common/gl_q2bsp.c
View File

@ -8367,7 +8367,7 @@ unsigned int Q23BSP_FatPVS(model_t *mod, const vec3_t org, pvsbuffer_t *fte_rest
qboolean Q23BSP_EdictInFatPVS(model_t *mod, const pvscache_t *ent, const qbyte *pvs, const int *areas)
{
int i,l;
int nullarea = (mod->fromgame != fg_quake3)?-1:0;
int nullarea = (mod->fromgame != fg_quake3)?0:-1;
if (areas)
{
for (i = 1; ; i++)
@ -8565,10 +8565,11 @@ int CM_WriteAreaBits (model_t *mod, qbyte *buffer, int area, qboolean merge)
int i;
int floodnum;
int bytes;
int nullarea = (mod->fromgame != fg_quake3)?0:-1;
bytes = (prv->numareas+7)>>3;
if (map_noareas.value || (area < 0 && !merge))
if (map_noareas.value || (area == nullarea && !merge))
{ // for debugging, send everything
if (!merge)
memset (buffer, 255, bytes);
@ -8581,7 +8582,7 @@ int CM_WriteAreaBits (model_t *mod, qbyte *buffer, int area, qboolean merge)
floodnum = prv->areaflood[area].floodnum;
for (i=0 ; i<prv->numareas ; i++)
{
if (prv->areaflood[i].floodnum == floodnum || !area)
if (prv->areaflood[i].floodnum == floodnum)
buffer[i>>3] |= 1<<(i&7);
}
}

2
engine/server/world.c
View File

@ -1090,7 +1090,7 @@ void Q23BSP_FindTouchedLeafs(model_t *model, struct pvscache_s *ent, const float
int topnode;
int i, j;
int area;
int nullarea = (model->fromgame == fg_quake2)?0:-1;
int nullarea = (model->fromgame != fg_quake3)?0:-1; //q2 always has area0, while q3 defines the outside as not-an-area.
//ent->num_leafs == q2's ent->num_clusters
ent->num_leafs = 0;