From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 29 Nov 2011 14:12:09 +0000 (-0800)
Subject: Merge branch 'master' into divVerent/csqcmodel
X-Git-Tag: xonotic-v0.6.0~74^2~100^2~40
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=47dcb7c178cdc45827b28292773dea344613fa06;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/csqcmodel

Conflicts:
	qcsrc/server/cl_client.qc
---

47dcb7c178cdc45827b28292773dea344613fa06
diff --cc qcsrc/server/cl_client.qc
index a113416fc,40039ead8..8c6b5db62
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1674,15 -1810,7 +1687,17 @@@ void ClientConnect (void
  	if(!autocvar_g_campaign)
  		Send_CSQC_Centerprint_Generic(self, CPID_MOTD, getwelcomemessage(), autocvar_welcome_message_time, 0);
  
 +#ifndef NO_LEGACY_NETWORKING
 +	if(autocvar_sv_use_csqc_players)
 +	{
 +		CSQCModel_LinkEntity();
 +		self.iscsqcmodel = 1;
 +	}
 +#else
 +	CSQCModel_LinkEntity();
 +#endif
++
+ 	self.model_randomizer = random();
  }
  
  /*