From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 15 Apr 2006 06:46:09 +0000 (+0000)
Subject: fix clientside bmodel collisions (now can walk around on the start.bsp main room... 
X-Git-Tag: xonotic-v0.1.0preview~4084
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d77febcff573a549cd23bb380bbc666b4ba0202a;p=xonotic%2Fdarkplaces.git

fix clientside bmodel collisions (now can walk around on the start.bsp main room floor, lifts, be blocked by doors, etc)


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

diff --git a/cl_main.c b/cl_main.c
index e4f59f63..22acc719 100644
--- a/cl_main.c
+++ b/cl_main.c
@@ -1488,6 +1488,7 @@ void CL_LerpPlayer(float frac)
 
 void CSQC_RelinkAllEntities (int drawmask)
 {
+	cl.num_brushmodel_entities = 0;
 	CL_RelinkNetworkEntities(drawmask);
 	if(drawmask & ENTMASK_ENGINE)
 	{
@@ -1526,7 +1527,6 @@ int CL_ReadFromServer(void)
 	r_refdef.extraupdate = !r_speeds.integer;
 	r_refdef.numentities = 0;
 	r_refdef.viewentitymatrix = identitymatrix;
-	cl.num_brushmodel_entities = 0;
 
 	if (cls.state == ca_connected && cls.signon == SIGNONS)
 	{
@@ -1541,6 +1541,7 @@ int CL_ReadFromServer(void)
 		CL_ClientMovement_Replay();
 		if(!csqc_loaded)	//[515]: csqc
 		{
+			cl.num_brushmodel_entities = 0;
 			CL_RelinkNetworkEntities(65535);
 
 			// move particles