From 388b1333ef082997950dbe7506903b6aca5648aa Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 8 Sep 2024 05:36:49 +1000 Subject: [PATCH] Backport some minor fixes from master to ease transition testing --- gl_rmain.c | 3 ++- sv_main.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gl_rmain.c b/gl_rmain.c index 7b2c7ac6..5b39c61f 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -12415,7 +12415,8 @@ void R_DrawModelSurfaces(entity_render_t *ent, qboolean skysurfaces, qboolean wr int updated = 0; for (j = model->firstmodelsurface, endj = model->firstmodelsurface + model->nummodelsurfaces;j < endj;j++) { - if (update[j]) + // Update brush entities even if not visible otherwise they'll render solid black. + if (update[j] && (r_refdef.viewcache.world_surfacevisible[j] || ent != r_refdef.scene.worldentity)) { updated++; R_BuildLightMap(ent, surfaces + j); diff --git a/sv_main.c b/sv_main.c index dd0d404d..6f912133 100644 --- a/sv_main.c +++ b/sv_main.c @@ -1346,7 +1346,7 @@ static qboolean SV_PrepareEntityForSending (prvm_edict_t *ent, entity_state_t *c if (f) cs->effects |= ((unsigned int)f & 0xff) << 24; - if (PRVM_serveredictfloat(ent, movetype) == MOVETYPE_STEP) + if (PRVM_serveredictfloat(ent, movetype) == MOVETYPE_STEP || ((int)PRVM_serveredictfloat(ent, flags) & FL_MONSTER)) cs->flags |= RENDER_STEP; if (cs->number != sv.writeentitiestoclient_cliententitynumber && (cs->effects & EF_LOWPRECISION) && cs->origin[0] >= -32768 && cs->origin[1] >= -32768 && cs->origin[2] >= -32768 && cs->origin[0] <= 32767 && cs->origin[1] <= 32767 && cs->origin[2] <= 32767) cs->flags |= RENDER_LOWPRECISION; -- 2.39.2