From: Samual <samual@xonotic.org>
Date: Wed, 26 Oct 2011 13:06:25 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/balance
X-Git-Tag: xonotic-v0.6.0~35^2~66^2~2^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1c62f7a27b54573d6f25a6b936026c549df2c6ef;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/balance
---

1c62f7a27b54573d6f25a6b936026c549df2c6ef
diff --cc qcsrc/client/Main.qc
index 4fdb5078f,58dfe2283..6fb5f6585
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -140,12 -137,21 +136,15 @@@ void CSQC_Init(void
  	DamageInfo_Precache();
  	Vehicles_Precache();
  	turrets_precache();
 -
 -	if(autocvar_cl_announcer != cl_announcer_prev) {
 -		Announcer_Precache();
 -		if(cl_announcer_prev)
 -			strunzone(cl_announcer_prev);
 -		cl_announcer_prev = strzone(autocvar_cl_announcer);
 -	}
 +  Announcer_Precache();
  	Tuba_Precache();
- 
- 	if(autocvar_cl_reticle_item_normal) precache_pic("gfx/reticle_normal");
- 	if(autocvar_cl_reticle_item_nex) precache_pic("gfx/reticle_nex");
- 
+ 	
+ 	if(autocvar_cl_reticle)
+ 	{
+ 		if(autocvar_cl_reticle_item_normal) { precache_pic("gfx/reticle_normal"); }
+ 		if(autocvar_cl_reticle_item_nex) { precache_pic("gfx/reticle_nex"); }
+ 	}
+ 	
  	get_mi_min_max_texcoords(1); // try the CLEVER way first
  	minimapname = strcat("gfx/", mi_shortname, "_radar.tga");
  	shortmapname = mi_shortname;