adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separated IP planets and sun colormaps (as was originally intended)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2033 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-12-05 16:06:43 +00:00
parent 382a2afcbe
commit b2fdd16554
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/content/ipanims/ip_sun.ani
+5 -5
View File
@@ -1,5 +1,5 @@
ip_sun.0.png 0 111 2 2 ip_sun.0.png 0 56 2 2
ip_sun.1.png 0 111 4 3 ip_sun.1.png 0 56 4 3
ip_sun.2.png 0 111 8 7 ip_sun.2.png 0 56 8 7
ip_sun.3.png 0 111 16 15 ip_sun.3.png 0 56 16 15
ip_sun.4.png 0 111 26 24 ip_sun.4.png 0 56 26 24
sc2/content/ipanims/ip_sun.ct
Executable
BIN
View File
Binary file not shown.
sc2/content/ipanims/orbplan.ct
BIN
View File
Binary file not shown.
sc2/src/sc2code/planets/solarsys.c
+16 -9
View File
@@ -47,6 +47,7 @@ void RenderTopography (BOOLEAN Reconstruct);
PSOLARSYS_STATE pSolarSysState; PSOLARSYS_STATE pSolarSysState;
FRAME SISIPFrame, SunFrame, OrbitalFrame, SpaceJunkFrame; FRAME SISIPFrame, SunFrame, OrbitalFrame, SpaceJunkFrame;
COLORMAP OrbitalCMap; COLORMAP OrbitalCMap;
COLORMAP SunCMap;
MUSIC_REF SpaceMusic; MUSIC_REF SpaceMusic;
#define DRAW_STARS (1 << 0) #define DRAW_STARS (1 << 0)
@@ -177,6 +178,8 @@ FreeIPData (void)
SISIPFrame = 0; SISIPFrame = 0;
DestroyDrawable (ReleaseDrawable (SunFrame)); DestroyDrawable (ReleaseDrawable (SunFrame));
SunFrame = 0; SunFrame = 0;
DestroyColorMap (ReleaseColorMap (SunCMap));
SunCMap = 0;
DestroyColorMap (ReleaseColorMap (OrbitalCMap)); DestroyColorMap (ReleaseColorMap (OrbitalCMap));
OrbitalCMap = 0; OrbitalCMap = 0;
DestroyDrawable (ReleaseDrawable (OrbitalFrame)); DestroyDrawable (ReleaseDrawable (OrbitalFrame));
@@ -199,6 +202,7 @@ LoadIPData (void)
OrbitalCMap = CaptureColorMap (LoadColorMap (ORBPLAN_COLOR_MAP)); OrbitalCMap = CaptureColorMap (LoadColorMap (ORBPLAN_COLOR_MAP));
OrbitalFrame = CaptureDrawable ( OrbitalFrame = CaptureDrawable (
LoadGraphic (ORBPLAN_MASK_PMAP_ANIM)); LoadGraphic (ORBPLAN_MASK_PMAP_ANIM));
SunCMap = CaptureColorMap (LoadColorMap (IPSUN_COLOR_MAP));
SunFrame = CaptureDrawable (LoadGraphic (SUN_MASK_PMAP_ANIM)); SunFrame = CaptureDrawable (LoadGraphic (SUN_MASK_PMAP_ANIM));
SpaceMusic = LoadMusicInstance (IP_MUSIC); SpaceMusic = LoadMusicInstance (IP_MUSIC);
@@ -1709,18 +1713,21 @@ DrawSystem (SIZE radius, BOOLEAN IsInnerSystem)
{ {
for (;;) for (;;)
{ {
COUNT color_index;
pCurDesc = &pSolarSysState->PlanetDesc[index]; pCurDesc = &pSolarSysState->PlanetDesc[index];
/* Star color fix - draw the star using OrbitalCMap */ /* Star color fix - draw the star using own cmap */
if (pCurDesc == &pSolarSysState->SunDesc[0]) if (pCurDesc == &pSolarSysState->SunDesc[0])
color_index = STAR_COLOR (CurStarDescPtr->Type); {
SetColorMap (GetColorMapAddress (SetAbsColorMapIndex (
SunCMap, STAR_COLOR (CurStarDescPtr->Type)
)));
}
else else
color_index = PLANCOLOR (PlanData[ {
pCurDesc->data_index & ~PLANET_SHIELDED ].Type); SetColorMap (GetColorMapAddress (SetAbsColorMapIndex (
OrbitalCMap, PLANCOLOR (PlanData[
SetColorMap (GetColorMapAddress ( pCurDesc->data_index & ~PLANET_SHIELDED].Type)
SetAbsColorMapIndex (OrbitalCMap, color_index))); )));
}
DrawStamp (&pCurDesc->image); DrawStamp (&pCurDesc->image);
if (index == pSolarSysState->LastPlanetIndex) if (index == pSolarSysState->LastPlanetIndex)