From 2eaee9af885a46ea30a16de0580a20accfb76ff4 Mon Sep 17 00:00:00 2001
From: gewlitys <gewlitys@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Wed, 17 Dec 2003 15:06:02 +0000
Subject: [PATCH] Better-looking slave shield (bug #32), from Nic

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1305 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/ChangeLog                     |  1 +
 sc2/src/sc2code/planets/plangen.c | 26 +++++++++++---------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index fe43c63c3..cac96082a 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.4:
+- Better-looking slave shield (bug #32), from Nic
 - Bay door animations don't stall before aborting (bug #500), from 
   chmmravatar
 - Reports SDL version on startup (bug #520) - Mika,Nic
diff --git a/sc2/src/sc2code/planets/plangen.c b/sc2/src/sc2code/planets/plangen.c
index 11bad61a3..c28fb9d0f 100644
--- a/sc2/src/sc2code/planets/plangen.c
+++ b/sc2/src/sc2code/planets/plangen.c
@@ -501,7 +501,7 @@ init_zoom_array (COUNT *zoom_arr)
 // this routine, but a filter can be applied if desired too.
 
 //Outer diameter of HALO
-#define SHIELD_RADIUS (RADIUS + 5) 
+#define SHIELD_RADIUS (RADIUS + 6) 
 #define SHIELD_DIAM ((SHIELD_RADIUS << 1) + 1)
 #define SHIELD_RADIUS_2 (SHIELD_RADIUS * SHIELD_RADIUS)
 static void CreateShieldMask (void)
@@ -517,11 +517,11 @@ static void CreateShieldMask (void)
 	rgba = pSolarSysState->Orbit.ScratchArray;
 	p_rgba = rgba;
 	// This is a non-transparent red for the halo
-	red_nt = 180;
+	red_nt = 222;
 	//  This is 100% transparent.
 	clear = frame_mapRGBA (ShieldFrame, 0, 0, 0, 0);
 	aa_delta = SHIELD_RADIUS_2 - (SHIELD_RADIUS - 1) * (SHIELD_RADIUS - 1);
-	aa_delta2 = (RADIUS + 3) * (RADIUS + 3) - (RADIUS + 2)*(RADIUS + 2);
+	aa_delta2 =  (RADIUS + 1) * (RADIUS + 1) - RADIUS_2;
 	for (y = -SHIELD_RADIUS; y <= SHIELD_RADIUS; y++)
 	{
 		for (x = -SHIELD_RADIUS; x <= SHIELD_RADIUS; x++)
@@ -533,27 +533,23 @@ static void CreateShieldMask (void)
 				if (rad2 <= RADIUS_2)
 					// The mask for the planet
 					p=clear;
-				else if (rad2 <= (RADIUS + 2) * (RADIUS + 2))
-					// The space between the halo and the planet
-					p = frame_mapRGBA (ShieldFrame, 0, 0, 0, 255);
 				else
 				{
 					// The halo itself
 					UBYTE red = red_nt;
-					if (rad2 > (SHIELD_RADIUS - 1) * (SHIELD_RADIUS - 1))
+					if (rad2 < (RADIUS + 1) * (RADIUS + 1))
 					{
 						DWORD r;
-						r = rad2 - (SHIELD_RADIUS - 1) * (SHIELD_RADIUS - 1);
-						red = red_nt - (UBYTE)(red_nt * r / aa_delta);
-					} 
-					else if (rad2 < (RADIUS + 3) * (RADIUS + 3))
-					{
-						DWORD r;
-						r = rad2 - (RADIUS + 2) * (RADIUS + 2);
+						r = rad2 - RADIUS_2;
 						red = (UBYTE)(red_nt * r / aa_delta2);
 					}
+					else if (rad2 > (RADIUS + 2) * (RADIUS + 2))
+					{
+						DWORD r;
+						r = rad2 - ((RADIUS + 1) * (RADIUS + 1));
+						red = (UBYTE)red - (red * r / (SHIELD_RADIUS_2 - RADIUS_2 + 1));
+					}
 					p = frame_mapRGBA (ShieldFrame, red, 0, 0, 255);
-
 				}
 			} 
 			else