From: terencehill <piuntn@gmail.com>
Date: Sat, 27 May 2017 12:49:08 +0000 (+0200)
Subject: Indent healtharmor.qc consistently
X-Git-Tag: xonotic-v0.8.5~2749
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=24a6e9205038b80f85c47add011f6812ba1309b8;p=xonotic%2Fxonotic-data.pk3dir.git

Indent healtharmor.qc consistently
---

diff --git a/qcsrc/client/hud/panel/healtharmor.qc b/qcsrc/client/hud/panel/healtharmor.qc
index 52d04bd93..69fced532 100644
--- a/qcsrc/client/hud/panel/healtharmor.qc
+++ b/qcsrc/client/hud/panel/healtharmor.qc
@@ -79,8 +79,8 @@ void HUD_HealthArmor()
 	int baralign = autocvar_hud_panel_healtharmor_baralign;
 	int iconalign = autocvar_hud_panel_healtharmor_iconalign;
 
-    int maxhealth = autocvar_hud_panel_healtharmor_maxhealth;
-    int maxarmor = autocvar_hud_panel_healtharmor_maxarmor;
+	int maxhealth = autocvar_hud_panel_healtharmor_maxhealth;
+	int maxarmor = autocvar_hud_panel_healtharmor_maxarmor;
 	if(autocvar_hud_panel_healtharmor_combined) // combined health and armor display
 	{
 		vector v;
@@ -88,15 +88,14 @@ void HUD_HealthArmor()
 
 		float hp = floor(v.x + 1);
 
-        float maxtotal = maxhealth + maxarmor;
+		float maxtotal = maxhealth + maxarmor;
 		string biggercount;
 		if(v.z) // NOT fully armored
 		{
 			biggercount = "health";
 			if(autocvar_hud_panel_healtharmor_progressbar)
 				HUD_Panel_DrawProgressBar(pos, mySize, autocvar_hud_panel_healtharmor_progressbar_health, hp/maxtotal, 0, (baralign == 1 || baralign == 2), autocvar_hud_progressbar_health_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-			if(armor)
-            if(autocvar_hud_panel_healtharmor_text)
+			if(armor && autocvar_hud_panel_healtharmor_text)
 				drawpic_aspect_skin(pos + eX * mySize.x - eX * 0.5 * mySize.y, "armor", '0.5 0.5 0' * mySize.y, '1 1 1', panel_fg_alpha * armor / health, DRAWFLAG_NORMAL);
 		}
 		else
@@ -104,11 +103,10 @@ void HUD_HealthArmor()
 			biggercount = "armor";
 			if(autocvar_hud_panel_healtharmor_progressbar)
 				HUD_Panel_DrawProgressBar(pos, mySize, autocvar_hud_panel_healtharmor_progressbar_armor, hp/maxtotal, 0, (baralign == 1 || baralign == 2), autocvar_hud_progressbar_armor_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-			if(health)
-            if(autocvar_hud_panel_healtharmor_text)
+			if(health && autocvar_hud_panel_healtharmor_text)
 				drawpic_aspect_skin(pos + eX * mySize.x - eX * 0.5 * mySize.y, "health", '0.5 0.5 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 		}
-        if(autocvar_hud_panel_healtharmor_text)
+		if(autocvar_hud_panel_healtharmor_text)
 			DrawNumIcon(pos, mySize, hp, biggercount, 0, iconalign, HUD_Get_Num_Color(hp, maxtotal), 1);
 
 		if(fuel)