X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2FView.qc;h=9ffe5a738c67634732ac4716a6fc8e7ccace8106;hp=cdf86aada4826992c731c927a968984931497578;hb=f879dea04474678d9a263cf5d8c127415e390ca5;hpb=6c4aca14b76d71f2ebabb059cd1ee30f6cb7c790

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index cdf86aada4..9ffe5a738c 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -482,7 +482,7 @@ void CSQC_UpdateView(float w, float h)
 	}
 
 	// do lockview after event chase camera so that it still applies whenever necessary.
-	if(autocvar_cl_lockview || (autocvar__hud_configure && spectatee_status <= 0) || intermission > 1)
+	if(autocvar_cl_lockview || (!autocvar_hud_cursormode && (autocvar__hud_configure && spectatee_status <= 0 || intermission > 1)))
 	{
 		setproperty(VF_ORIGIN, freeze_org);
 		setproperty(VF_ANGLES, freeze_ang);
@@ -1190,7 +1190,8 @@ void CSQC_UpdateView(float w, float h)
 
 			if(autocvar_crosshair_hitindication)
 			{
-				vector hitindication_color = stov(autocvar_crosshair_hitindication_color);
+				vector hitindication_color = ((autocvar_crosshair_color_per_weapon) ? stov(autocvar_crosshair_hitindication_per_weapon_color) : stov(autocvar_crosshair_hitindication_color));
+				
 				if(hitindication_crosshair_time < hit_time)
 				{
 					if(time - hit_time < MAX_TIME_DIFF) // don't trigger the animation if it's too old
@@ -1475,6 +1476,8 @@ void CSQC_UpdateView(float w, float h)
             CSQC_RAPTOR_HUD();
         else if(hud == HUD_BUMBLEBEE)
             CSQC_BUMBLE_HUD();
+        else if(hud == HUD_BUMBLEBEE_GUN)
+            CSQC_BUMBLE_GUN_HUD();
     }
 	
 	cl_notice_run();