Merge pull request #493 from ln-zookeeper/master

niffiwan · niffiwan · commit c9cff48b9504 · 2015-12-08T22:49:09.000+10:00
Fix a small glitch in shield icon alpha range
diff --git a/code/hud/hudshield.cpp b/code/hud/hudshield.cpp
@@ -743,7 +743,7 @@ void HudGaugeShield::showShields(object *objp, int mode)
 				continue;
 		}
 
-		range = MAX(HUD_COLOR_ALPHA_MAX, HUD_color_alpha + 4);
+		range = MAX(HUD_COLOR_ALPHA_MAX, HUD_color_alpha + objp->n_quadrants);
 
 		if ( !(sip->flags2 & SIF2_MODEL_POINT_SHIELDS) )
 			hud_color_index = fl2i( (objp->shield_quadrant[Quadrant_xlate[i]] / max_shield) * range);

Original file line number	Diff line number	Diff line change
`@@ -743,7 +743,7 @@ void HudGaugeShield::showShields(object *objp, int mode)`
`743`	`743`	`continue;`
`744`	`744`	`}`
`745`	`745`
`746`		`- range = MAX(HUD_COLOR_ALPHA_MAX, HUD_color_alpha + 4);`
	`746`	`+ range = MAX(HUD_COLOR_ALPHA_MAX, HUD_color_alpha + objp->n_quadrants);`
`747`	`747`
`748`	`748`	`if ( !(sip->flags2 & SIF2_MODEL_POINT_SHIELDS) )`
`749`	`749`	`hud_color_index = fl2i( (objp->shield_quadrant[Quadrant_xlate[i]] / max_shield) * range);`