From 95a89be509f05baf82f22777632a8da3f55eeb01 Mon Sep 17 00:00:00 2001 From: Nico de Poel Date: Sat, 17 Jul 2021 16:43:32 +0200 Subject: [PATCH] Set and remove view entity model; this makes the weapon model appear correctly in first-person view --- engine/Quake/gl_rmain.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/engine/Quake/gl_rmain.c b/engine/Quake/gl_rmain.c index 466cbd7..bf743fd 100644 --- a/engine/Quake/gl_rmain.c +++ b/engine/Quake/gl_rmain.c @@ -667,21 +667,36 @@ R_DrawViewModel -- johnfitz -- gutted */ void R_DrawViewModel (void) { + currententity = &cl.viewent; + if (!r_drawviewmodel.value || !r_drawentities.value || chase_active.value) + { + UQ_Game_RemoveEntity(currententity->num); return; + } if (cl.items & IT_INVISIBILITY || cl.stats[STAT_HEALTH] <= 0) + { + UQ_Game_RemoveEntity(currententity->num); return; + } - currententity = &cl.viewent; if (!currententity->model) + { + UQ_Game_RemoveEntity(currententity->num); return; + } //johnfitz -- this fixes a crash if (currententity->model->type != mod_alias) + { + UQ_Game_RemoveEntity(currententity->num); return; + } //johnfitz + UQ_Game_SetEntityModel(currententity->num, currententity->model->name); + // hack the depth range to prevent view model from poking into walls glDepthRange (0, 0.3); R_DrawAliasModel (currententity);