From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 7 Apr 2018 19:14:39 +0000 (+0000)
Subject: Don't duplicate the entity relinking when using CSQC.
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=85b3fedf1e968fb413bac5730e8f9627de987acb

Don't duplicate the entity relinking when using CSQC.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12366 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cl_main.c b/cl_main.c
index ebde7dae..dbb774af 100644
--- a/cl_main.c
+++ b/cl_main.c
@@ -1948,7 +1948,9 @@ void CL_UpdateWorld(void)
 		// update the engine-based viewmodel
 		CL_UpdateViewModel();
 
-		CSQC_RelinkAllEntities(ENTMASK_ENGINE | ENTMASK_ENGINEVIEWMODELS);
+		// when csqc is loaded, it will call this in CSQC_UpdateView
+		if (!cl.csqc_loaded)
+			CSQC_RelinkAllEntities(ENTMASK_ENGINE | ENTMASK_ENGINEVIEWMODELS);
 
 		// decals, particles, and explosions will be updated during rneder
 	}