X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=595b14368e1c8d3bdd7d7bb6eed64768a9570e70;hb=b58d514c07e4b22b86a93977653787902efba1d6;hp=dc2efb27a2a61f1f84f10a7492687315a3972f38;hpb=9bc9f1ca09aa498304c26b9da970e48da05f3124;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index dc2efb27a..595b14368 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -526,8 +526,7 @@ void HUD_Weapons(void)
 		weaponorder_cmp_str = string_null;
 	}
 
-	if(autocvar_hud_panel_weapons_complainbubble)
-	if(autocvar__hud_configure || time - complain_weapon_time >= when + fadetime)
+	if(!autocvar_hud_panel_weapons_complainbubble || autocvar__hud_configure || time - complain_weapon_time >= when + fadetime)
 		complain_weapon = 0;
 
 	// determine which weapons are going to be shown
@@ -734,7 +733,7 @@ void HUD_Weapons(void)
 		weapon_id = self.impulse;
 
 		// skip if this weapon doesn't exist
-		if (!self || self.impulse < 0) { continue; }
+		if(!self || weapon_id < 0) { continue; }
 
 		// skip this weapon if we don't own it (and onlyowned is enabled)-- or if weapons_complainbubble is showing for this weapon
 		if(autocvar_hud_panel_weapons_onlyowned)
@@ -2027,7 +2026,7 @@ void HUD_Radar(void)
 	draw_teamradar_player(view_origin, view_angles, '1 1 1');
 
 	drawresetcliparea();
-};
+}
 
 // Score (#7)
 //