From 20415c7ebce2a53731d87ee5e9c67386f02f6e85 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Thu, 4 May 2023 08:23:58 -0700 Subject: [PATCH] NSClientPlayer: Inherit player rendermode/fx/color/amt before calling UpdatePlayerAttachments() --- src/shared/NSClientPlayer.qc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/shared/NSClientPlayer.qc b/src/shared/NSClientPlayer.qc index b51a75a3..77cfe701 100644 --- a/src/shared/NSClientPlayer.qc +++ b/src/shared/NSClientPlayer.qc @@ -279,14 +279,18 @@ NSClientPlayer::predraw(void) localplayer = veh.HidePlayermodel(); } + p_model.SetRenderMode(GetRenderMode()); + p_model.SetRenderColor(GetRenderColor()); + p_model.SetRenderFX(GetRenderFX()); + p_model.SetRenderAmt(GetRenderAmt()); + /* if we're forcing third-person.. or this is not us - render this player */ if (autocvar_pm_thirdPerson == TRUE || !localplayer) { /* mark as not-mirror-only */ renderflags &= ~RF_EXTERNALMODEL; /* same for our attachment */ - if (p_model) - p_model.renderflags &= ~RF_EXTERNALMODEL; + p_model.renderflags &= ~RF_EXTERNALMODEL; /* let mods override attachments and whatnot */ UpdatePlayerAttachments(true); @@ -309,8 +313,7 @@ NSClientPlayer::predraw(void) renderflags |= RF_EXTERNALMODEL; /* ditto */ - if (p_model) - p_model.renderflags |= RF_EXTERNALMODEL; + p_model.renderflags |= RF_EXTERNALMODEL; /* give mods a chance to de-render attachments */ UpdatePlayerAttachments(false);