From eff3f68a71c14f2e4c395fb3e113b627457f8899 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 26 Apr 2020 15:02:39 +0200 Subject: [PATCH] Fix #2429 "precache_playermodel() does not account for :skin suffix which is allowed in sv_defaultplayermodel" (patch by nico) --- qcsrc/server/miscfunctions.qc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 4e2113f53..9dd468c2d 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -856,9 +856,14 @@ void readplayerstartcvars() void precache_playermodel(string m) { - float globhandle, i, n; + int globhandle, i, n; string f; + // remove : suffix + int j = strstrofs(m, ":", 0); + if(j >= 0) + m = substring(m, 0, j); + if(substring(m, -9, 5) == "_lod1") return; if(substring(m, -9, 5) == "_lod2") -- 2.39.2