From b2fdd165546ed57fff30b7f82cad9de034a272dd Mon Sep 17 00:00:00 2001 From: avolkov Date: Mon, 5 Dec 2005 16:06:43 +0000 Subject: [PATCH] Separated IP planets and sun colormaps (as was originally intended) git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2033 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/content/ipanims/ip_sun.ani | 10 +++++----- sc2/content/ipanims/ip_sun.ct | Bin 0 -> 6978 bytes sc2/content/ipanims/orbplan.ct | Bin 6978 -> 6978 bytes sc2/src/sc2code/planets/solarsys.c | 25 ++++++++++++++++--------- 4 files changed, 21 insertions(+), 14 deletions(-) create mode 100755 sc2/content/ipanims/ip_sun.ct diff --git a/sc2/content/ipanims/ip_sun.ani b/sc2/content/ipanims/ip_sun.ani index 273c8fb62..039930853 100755 --- a/sc2/content/ipanims/ip_sun.ani +++ b/sc2/content/ipanims/ip_sun.ani @@ -1,5 +1,5 @@ -ip_sun.0.png 0 111 2 2 -ip_sun.1.png 0 111 4 3 -ip_sun.2.png 0 111 8 7 -ip_sun.3.png 0 111 16 15 -ip_sun.4.png 0 111 26 24 +ip_sun.0.png 0 56 2 2 +ip_sun.1.png 0 56 4 3 +ip_sun.2.png 0 56 8 7 +ip_sun.3.png 0 56 16 15 +ip_sun.4.png 0 56 26 24 diff --git a/sc2/content/ipanims/ip_sun.ct b/sc2/content/ipanims/ip_sun.ct new file mode 100755 index 0000000000000000000000000000000000000000..0e746101c8413fbfcc2a76a149ef44ba155c776a GIT binary patch literal 6978 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 literal 0 HcmV?d00001 diff --git a/sc2/content/ipanims/orbplan.ct b/sc2/content/ipanims/orbplan.ct index c42595aa61ccf6a0edd143060bf60f41d2f9c41e..ee3e19ed5741e714806408cb2012eaaaa3a8953c 100755 GIT binary patch delta 220 zcmW;A&k6xi9K~_>UjHp@6qDi=gh*tqY?aW=9i_a0GQvB|bTpC|u(P0qjjXJtBrjp1 zkd2?&d_Sji%pG%Ph9#`5WF>1NS<`w-W}wC-v$3YG5#f@Z(W5?a;kt+=W5^3tq{=Bw z$%TXpSa|0XF+?j}aRI#`%&?gV?1FoJnbD`js)S1(d(}wT=Y@I6p{~kEK r`E{-+C(wvBj5g%!lw|1l-XHNzQ90*K7_+Bir9CUOAAun_PVza zV(A6u=s{5N;@`{nbNm*)qPMtV(%l*syH~@M+ZbjsWQIB9RF6w;SP4rFSn*VJuO<3I zi-$pscXFf^w&e5NLY-;xmN_iR{M+Ly(&D!&@kFk70e{hiN!-=wh7YR3o@((}KmER_ x9__~I_d*S*8Y!0&_vZPlanetDesc[index]; - /* Star color fix - draw the star using OrbitalCMap */ + /* Star color fix - draw the star using own cmap */ if (pCurDesc == &pSolarSysState->SunDesc[0]) - color_index = STAR_COLOR (CurStarDescPtr->Type); + { + SetColorMap (GetColorMapAddress (SetAbsColorMapIndex ( + SunCMap, STAR_COLOR (CurStarDescPtr->Type) + ))); + } else - color_index = PLANCOLOR (PlanData[ - pCurDesc->data_index & ~PLANET_SHIELDED ].Type); - - SetColorMap (GetColorMapAddress ( - SetAbsColorMapIndex (OrbitalCMap, color_index))); + { + SetColorMap (GetColorMapAddress (SetAbsColorMapIndex ( + OrbitalCMap, PLANCOLOR (PlanData[ + pCurDesc->data_index & ~PLANET_SHIELDED].Type) + ))); + } DrawStamp (&pCurDesc->image); if (index == pSolarSysState->LastPlanetIndex)