Star sizes and colors are now correct in solar system, from fOSSiL

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@450 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/content/ipanims/ip_sun.ani

@@ -1,5 +1,5 @@
-ip_sun.0.png 0 56 2 2
+ip_sun.0.png 0 111 2 2
-ip_sun.1.png 0 56 4 3
+ip_sun.1.png 0 111 4 3
-ip_sun.2.png 0 56 8 7
+ip_sun.2.png 0 111 8 7
-ip_sun.3.png 0 56 16 15
+ip_sun.3.png 0 111 16 15
-ip_sun.4.png 0 56 26 24
+ip_sun.4.png 0 111 26 24

sc2/src/sc2code/planets/solarsys.c

@@ -142,10 +142,7 @@ LoadIPData (void)
 		OrbitalFrame = CaptureDrawable (
 				LoadGraphic (ORBPLAN_MASK_PMAP_ANIM)
 				);
-		SunFrame = SetAbsFrameIndex (
+		SunFrame = CaptureDrawable (LoadGraphic (SUN_MASK_PMAP_ANIM));
-				CaptureDrawable (LoadGraphic (SUN_MASK_PMAP_ANIM)),
-				STAR_TYPE (CurStarDescPtr->Type)
-				);
 
 		SpaceMusic = LoadMusicInstance (IP_MUSIC);
 	}
@@ -188,6 +185,13 @@ LoadSolarSys (void)
 			CurStarDescPtr->star_pt.y)
 			);
 
+	/* 2002-12-20 = fOSSiL = Star size fix
+	 * set the frame index for the star size
+	 */
+	SunFrame = SetAbsFrameIndex (SunFrame,
+			STAR_TYPE (CurStarDescPtr->Type)
+			);
+
 	pCurDesc = &pSolarSysState->SunDesc[0];
 	pCurDesc->pPrevDesc = 0;
 	pCurDesc->rand_seed = Random ();
@@ -1700,10 +1704,21 @@ DrawSystem (SIZE radius, BOOLEAN IsInnerSystem)
 	{
 		for (;;)
 		{
+			COUNT color_index;
+
 			pCurDesc = &pSolarSysState->PlanetDesc[index];
+			/* 2002-12-20 by fOSSiL = Star color fix
+			 * draw the star using OrbitalCMap
+			 */
+			if (pCurDesc == &pSolarSysState->SunDesc[0])
+				color_index = STAR_COLOR (CurStarDescPtr->Type);
+			else
+				color_index = PLANCOLOR (PlanData[
+						pCurDesc->data_index & ~PLANET_SHIELDED
+						].Type);
+
 			SetColorMap (GetColorMapAddress (
-					SetAbsColorMapIndex (OrbitalCMap,
+					SetAbsColorMapIndex (OrbitalCMap, color_index)
-					PLANCOLOR (PlanData[pCurDesc->data_index & ~PLANET_SHIELDED].Type ))
 					));
 			DrawStamp (&pCurDesc->image);