From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 12 Oct 2010 18:02:45 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/fruitbalance'
X-Git-Tag: xonotic-v0.1.0preview~307^2~25^2~1^2~1
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=392daf627bb137aadf4c156dc8dfc4906475840e

Merge remote branch 'origin/fruitiex/fruitbalance'

Conflicts:
	qcsrc/client/View.qc
---

392daf627bb137aadf4c156dc8dfc4906475840e
diff --cc qcsrc/client/View.qc
index 9953af664b,89681c32a6..2fbb07d4eb
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -890,16 -882,7 +882,11 @@@ void CSQC_UpdateView(float w, float h
  				}
  
  				wcross_size = drawgetimagesize(wcross_name) * wcross_scale;
- 				if(bullets)
- 				{
- 					CROSSHAIR_DO_BLUR(CROSSHAIR_DRAW_RING, wcross_resolution, wcross_name, wcross_alpha);
- 				}
- 
  				CROSSHAIR_DRAW(wcross_resolution, wcross_name, wcross_alpha * f);
 +
 +				if(cvar("crosshair_dot"))
 +					CROSSHAIR_DRAW(wcross_resolution * cvar("crosshair_dot_size"), "gfx/crosshairdot.tga", wcross_alpha * f * cvar("crosshair_dot_alpha"));
 +
  				wcross_name_alpha_goal_prev = f;
  			}
  		}