Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 18:02:45 +0000 (20:02 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 18:02:45 +0000 (20:02 +0200)
Conflicts:
qcsrc/client/View.qc

1  2 
defaultXonotic.cfg
qcsrc/client/View.qc

Simple merge
@@@ -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;
                        }
                }