From 58bd7af73841e569b05b524f08a8b3afd39f67ce Mon Sep 17 00:00:00 2001 From: gewlitys Date: Fri, 20 Dec 2002 20:30:18 +0000 Subject: [PATCH] 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.0.png | Bin 896 -> 941 bytes sc2/content/ipanims/ip_sun.1.png | Bin 917 -> 968 bytes sc2/content/ipanims/ip_sun.2.png | Bin 960 -> 1034 bytes sc2/content/ipanims/ip_sun.3.png | Bin 1115 -> 1279 bytes sc2/content/ipanims/ip_sun.4.png | Bin 1257 -> 1525 bytes sc2/content/ipanims/ip_sun.ani | 10 +++++----- sc2/content/ipanims/orbplan.ct | Bin 642 -> 642 bytes sc2/src/sc2code/planets/solarsys.c | 27 +++++++++++++++++++++------ 8 files changed, 26 insertions(+), 11 deletions(-) diff --git a/sc2/content/ipanims/ip_sun.0.png b/sc2/content/ipanims/ip_sun.0.png index 0ca61c4227c2c83bd3a7589accff478576c7f7e4..b4c3bacc8ce562951e1d2fad71b5260c26e40e22 100644 GIT binary patch literal 941 zcmWlXQE1ag9LK+H(wfG$X}h#d+xWlMb{e|0q_xzn{JA!z)s)zfO2qKj!>*RDfvzjF zn}6h#;v72ZgCbJ1?cR%joKHQh@ zeVxl5Z3=b=0W{5}XO4Tb&a8mX+vRt^{OS$=$Eo=gP_e zN=GS;QyQbRm(r+B!#0iBw8f@Do7USD$q9^&BQc8jFk*ukIDq~8VOi+zMn?zQ+R)sL zU=a27sI3JZ2DOZz8BQ{`z*vT{X~t~E5{wNx%yQU(!y*m~Ijq59$e%=Z0qG2;XJJob z{6ic%grOlEJczzN^z@*;-Nf;NcoEnv*pTsa!zSlzoG)`;;5^6q6z55o$6TIpd9TaE zE^l->Ha4-khQ(zRP9v8``WR+rVA~iQLp+Xw0Ysw+htb#wzaRWGxNZExa8rn@LR=JL zU5I5NazY#_iP4gb6qbN^K~$R8dDNDqm5_it4YZ z_KL!@m-z7sb{^vPeQe*trLS=QJc>n}I)(XpOip5C#6<8~@II2d4^=dNZFr~k8?9ex z{YdM3T5oB+QPsJsUaab=s*Y84q^j}u9bUh|(-(O3825H?<6B(22G_;vDhdUp(?})} ziy;z0AOQUs+BN=_hO@7{5uck$<=s0=iQhKAxYaj>k+lndRbL(0!cy{|>Q6s^j~f3+ eK7Wg^5bb@6z(VWYb@|B;=KkDlc4l{a@$&y_RTVY> literal 896 zcmWlXPiRv~0LH(XrcGnp)R@+!jc>FqHk4FqEoqd;)P~eeiN>fA!>fZut29uh*n$ss zltmQ((1Rj`#qppXmR`112}_wp6m}1a2PFq}b}tHh5cXgW9_Cgj@S7QC7=H8dF}L%% zpW6K0egJJ#ne;KUdh5gIF|&O3;iFkRi>axC&*%I1%aPA!hy0mKea%2W78%yHNo#kdpm+bbakP-8)y?c?^ z2YVc;No2Cf9Yx_J9A;>7SioUnhxI$mVr-DHVa9C6QjBF8JIdHe#+dPQ8~hX+8`0W| zPzcc|`uh=&V{{a@jdU8BL&z6UJcXHA%*|tA2`)FZx;*6a9WEbsd5rTU=La~?b6(_p zmh*YempJFfFR~De_2y0ZNCbU-_1I%$n3zB|ixVf{oW^Vk7Z>4P!L^%MzK60f1j-^( z7O}Fh%VI=`gF@tmm=)rp5Lbk_Da1V?gz-xU@=m>cQ@bgAa1er$4bd?Mwll+yTB3F>kE+nDA} z_&s|tK90kOF+Gh^370S9>J2R4$AiaMS;HSM@b_C(m7%k$`l>2fRfVcLsMHyy7L;06 z>VZ;gO1)6(ty0SPwF|utpAX?MVlgC>$Yf9~Vr~wui(9vF_g6ex!P9lTdX4v=@cAoh z+7PbkSWO?O>6x0&YrUZLFIqp+`l;5hwf>~_SFQD*Z$^GIZ!|0&%N^gi@ZZ?~W<#dZ z69xC-+4s{wmwvbY`sdvST|2k_{oBUNY(7zpqT_imKH&2a z!WhJ+Bn=)6g-yvANIaQ~$zdsBsL+C?DN-nV%Fv64QbHkRFNFz|wr@T#?>94t5A)^w zzDg!$>b&h<0CltR=vjBxx~saT!u`IDJv0}dPa+EuApO%nGe_m_x$8>&>;iD>ePI0y z;N5@j`~&!W2>A07F!2y*{dD>FgAaiUBgsUp7;0-#U5(00R8*j>45Ssr@4g4rFhS`! zrK6M%P#U7Ni_%V;25cI%X@gC@Hm$NL!V?%9$M7fyh7jsU?*}+>0+xmLcC@shsR{M< z@On{Ih4OOHAyCWsnc+NRXBeAfY??8fv0=vgGtA1c-V6(7m_Ng6GYqNoNSr}@4%0E% zlNkR9Cr@H<5Pf~GK zOa!+DaUEjL_@!Y_${i{5Qr?l$kuob~svzxxj2Gl^L0SdbRFK%+!}bog^0;#!&TXt* z!{Q<`86*;zp2qk%`uj~CZV_$;@;+q7_?6*MsePrMEA>dJO{G?qx?EJJiz-!A;iBp( zs^+4?!6Clg$L@1HdWy}jar;Z$you#yT)2RR1x!w2WW+>pTX26Q^%QE^__g7U)~~gG zrS%J~pJ=_V^=e5cOFCQ9QzacL>0n9Y=nZ~-jqhLK#Y;Td#nv~tcMpz(r6r`(h{q8Q zBNRd~h?*Mcm(Y&!FVfw^lm(;kTc6P^7tpZ$2v(`D4Nu|#xlI=k^d DgRmc1 literal 917 zcmWlXUue@u0LQ;IrcGko)GTe2w*F3S(X6zk){1JlG4o&PTeSnvd~&?t^ZDNV{`s2OA%C!tHpe6g(vG@1 zcs%fW(a-?DA6vGdsR_X#wr)k}BZOPg){aON9i8af28$Rx7V%odXOTvW1PEy+q=k?$ zA#H?23F#zc8zIE_sRcTKO`A|(k3ay;%?O3i)`pG_SQd8fM9(h7deJw4!66LCk=O^D z8tQEtuxX1;BQ_0F+C}MhN@JAvQ949voYH-iQsZa+VCh27Iav|VLcAB80%$hkTILFBx6~|4l{O~F=qVS20w|- zo6*>aa2Q=(=;=XUABKlv+eoF5If#4#6DLue#PlrY7T|J2qszlC-|q53m&Z6yaK4}O zJm(XfPjWuX`2y$M_(c|CzSg`6AC02ByB2$71Y={!W^wEooKu*b!I^ou=WyXN7H^;= z48f9!mPD*1?2;G~;(!o&Atr@5Bg8o&E(>u(2x0uvfxK2L-_&jj@9jlAj${(K92^Hz zQ<(h2T5KgDk^P*H}~it4VYL`4-U>VQ&T zC^e_lqEdI1daTq_rCundj96BC%8hU?RmZA&e^nQ&IF>828yok&S&jTN@WK1jhf}Xkum9_x`tQ$V=;99- cr@veG;>SlHe|^2>`e)`o#?!gfO0sz2e{Uoi_W%F@ diff --git a/sc2/content/ipanims/ip_sun.2.png b/sc2/content/ipanims/ip_sun.2.png index e295b22dc78b2a2d94faef6a418d6090d6ca22e3..09822fd188e00139da98e3063e3b6c238e8c4539 100644 GIT binary patch literal 1034 zcmWlXUr1Y59LK+!L}UDu=weLN-kVm}2B*${*v#EtlMvfTG>ctICGDZXiZkF^nH{~1 zV@aKBtq8LSS?MXG?ZakYY#+iX7Yf~0n5>MAum{h}=EErMSVv%moq=q-_XFpA&p8iY zeqX-lS~790*3s+$P&*on9yhe!Sao)bvH#m&dBqUxd*SggF!|lyvE6dx?mrtlJ`Q~J zI*|Jq_~$=Ep8+3s1HYdEhCTzD&S!sn@&;f*ax66>o9vV27FqVmvPYKPvh0%OI!Sg& za*ZV0CD|s)7D-0yJ~X$$>w~8W?nX4chWdIqov5uvbv3H0P+19^4HgT^${;sEb{g|Q zH5pRXK~?Qj)lO9nsH$I8TNTx+)1L*8TdplZN;dY~@239NRX;8)V zXC~JfyUN%iW9Jx~W-Q6r(LC$RGbPUgdFIPAXP#m0I+m_NTg15qOlOfkgA*qZk0Tt$ z;lpN-wl?^DW(1=Jwg474{dJQqUB9dAd0k)DbxqeZx}GZNN@L;{fr1_#m6Vb)<3VN{^6LQk9i+~g_ek2t^2`AyE(IG^Wy zs>qKPd8){RMc!8AjYWz{EI zSM2IKU(^jk@w(CW#qgEwK!)7r*o%#J^u>mQ(PM918KZP>+*s)iwssfz+#Po>KEE$t z?t^sdc(p6w0#H4gh@UcNomn+bhuL5Dm%ncg$9!xw<8(TI`Sp!Gb3=M8Gh&{J8>A6M zMQ}J!T8i>=R8*j{64ljkyHQt%`q$uTfVUAoKLSl?Zb6V396?eVB+ekI3KAC~HH6d> z;vvLKh@X%qLRttR#!rKwVH6jmtPCy}YHCnl53d)20D?grJc#x~2z8<>jGjIWL=Zg; ziyF!->au99MST|aP})psE2SYyyD06WG(zcNN~!U)Zm^L;coW+MZfHPL6Am0eM+dsQ z(ch2A>#&9p8$lw8)JbH{BFhXFS?10%UzW9JS&*?##(EgD7>hBMWb7nkXBlJ0&n@tC zC@Dcz6+9j^H>15BU0oO$fMp>bM`8@=493qPH-+h0%q_s?hANwTY~E_~9-D_ak8*yL z^EBt7$n!&|+*q3qT8dlek z7Y27;`12x^7gk>M32{t_v=CE5TomH65Z8oQ6G9lj%tBr-ly7P`g?Dx$5uFPxOEpBo7j?u`YjpUl0928u_Y}jGg9WHw542@GB4#_DL18*#;<0e z?i9X_Y2JkI?Zwa#PMpBR1ZHM%=@J&NV)bLJ-@(Q`e6fRXA7NJ+8g^CNu8Que%&t17 z)SF7pDYdH9x>EO)+EMC}Qp)(X4ZRJg6Fwh8Aw;7{BrraX>1o(DR#tH1CT?%w{x-gO zh#wzg?b^6s? zzYYFjE|a72;f#Ijd=5q7oy||fN5W;ky=Uw8pAUW@jUDd{f4BWJ|Mxj5dAT_0@IHC= zk0xbbzgSxSJN)1ArOJ0(j|{EF7mJ@)eDdnU_P<_yRqL%AV>b_-|Ged=tK diff --git a/sc2/content/ipanims/ip_sun.3.png b/sc2/content/ipanims/ip_sun.3.png index 772206f751244e629b32f404cd652bf975f46330..4338807c00798edef3becb2f6f8f892d76bf2e91 100644 GIT binary patch literal 1279 zcmW-feM}Q~7{|XY1xtBpVWpH8?~35)x{8RbcH}s&4M=&lNR6y=qeH?=LYxs7Pj7d1Lvh9l0UE*Y043z}^*leuOtdYUEfZlC1$d-BWk%Qw$A z-{+veu{y<&Z2*u`BvT2}K#<7< zsVB&If{Y_b~BP1|YOM$@?zZKh}|MVlzvK+y>l4R;wzT_`Srvj}zv3SPykRUimtXTxGa zdOA{5VK5*e0a`8SBG81Y&#G)?*(R2)V_7fDQY>4{vW_521lfWhYYno-Ae$Iu5!i~x zCiv>$tpZg6*PB?s9&6U1un>89$jL!QhH6JKqF7+7z^+mCd6nHf-^=qIJm13eex7G| z-p%oLjxXkT8^@bDKAGdOb2qws5$ZroEBpcY>QPw*9ucx4f-xfC@Cgi!f*Zh&K6LaT*oG}z zP*(?!2OBo1M)LEKm8DuxQV{we)T#QS%8V#ZiDE<)heeSS#gHfl=0s{v^v#LIb0RS( zrq79(p26uU9FJgl9Na$i?m}lLfp-I)}p(*mnSX_MoQ++qR*h0TmTk zw@$U7q@XO4bPiIFsxPZ7%krWu&&%?xET5I-uq^M4$^Mueipfk&w#Q^^OvchOeptly zdCXqM*=Zb~#Ml@(4&B{oX@SoNw;OgltXAmtkS{~#RQ=Ax?RNmpzM4u;fIHnDVzg6J zS8O)NxKnRp?9mZVbK#~l)Eo1rx6&Bg_-!ycvEdnu!E1LWJmY6epwTsl+!^+P$A3QQ zx_hSlgT1NK-Jj(J5|zK^`p4xjpFY1=eT<;E*zzCu9uR9qqj{D-O2o={QVb5 zCCdAsKKQzGEIo{&*SNs~W5T9)YN6G)e{*2Zvf+B|b&E!4^2h)6*x?~-EZ zOp8Y^-JP{_u_bBm@p5Gbm-c4b{D{(+AA7QRB%G}^G09V&ffiQt^q)i5Y)xTkgS+lO z&u?{{X`B2mN$FmhSWDeJ|KP@@q=~&6?bxg#j8(l!3&QD literal 1115 zcmWlXeN2^A9LK+K0WX(V@q+hq@p*VtZ;W>dkUc%Z?ShwAk*Myox4(8%W;r5A|wO` z1H!|xZXF^c5fz1)7{tY4{dy#9fH@IK8)2~`*@l!&kYs^DlEWq0D9O>1Y?9?zS&o-w zvn(gcvQ?ICvb;%_W#LyPsJRFYMMMNlCd9@fApuEANKS?%Aw3g%AfJwS?>@q?r&R z{8Rzmhp;e2N5gDJN(wSFk)4gAA}9)+PPppO=tj#vw6&w73*Ei&Q9-ninte3YNArEu zPH8En<&-v3+CphNrCpTvQc8uN)q?e`H7~+jt;on&i(OKJiVD=$V$U9UoJXhUn|i`qruSy?D9 zhQon|26#O1deQX)eEm2+gke9HtAJAL@P0=*BrnPCBPt%TTnqSk# zHEmMUG~wr+;A3mwMl>(N7ZhN}4%FA9wH2M6IC2F2CvfU4M#eBPg$tK3Gmjt_BnEj# zke3FzJIJdzKfrl6=chOy;e3koOPtSh&V^t1L7#@v2#W=FJ4#F8a-pRK9UbubFgS?e zcQ87E^V7IIi-koj-NlM7u&n6z6}@~#Z(GqDb-i2HkLvoUuAkTSSzTY$^}D*Re=%41 zfp{aNx2fT&N6+6bxhD>*)y@jH@7(FL6$!7UMpu&09;V)$d82^OZl8`?V2hQTzsWBe zb$5-ee*V&fS3>9V-3Pkr4s>-4eN7XPy5*;1P1b84pY?`Eu7*yJe%e>&?9HnkUb-KB zv}o5aPYxDD{Ql!}nb(ZVHF`&;hs`p`Y!jO@x#ZwVW*!+AAh}d=Ah~D4eN#8 znyWV+UETlHqBnT|{fjSOzx|-+-+yebzy7;!3uIW{^ahiX5ASymzc^O^?VZ5f-xufZ oBui7jJ$`d~!q&WZ^wxa8;pv0VS|v}xTcQP2S2j2&9c{<{2Zpe9uK)l5 diff --git a/sc2/content/ipanims/ip_sun.4.png b/sc2/content/ipanims/ip_sun.4.png index 9b7458db2abeb2314f8b1d2307d5329c4cc0e098..20fba95167584e52eb4a69354f55ef7308b4e7dc 100644 GIT binary patch literal 1525 zcmW+$YfKbZ7(M#{#^tplZ*XUMs2hrc2rDJaxX?wHAh_zPxH>=;1R|)d7*{)M7pkJd z4_{eZhE%{t@e!eRHDBtuCum?YIC8K5Cm8q!Zg5*pG= zLn<^RqGuyA3gHn54MT7Uf@WdnOaunP-ygodm@xxBKJfB_LIIf!WEjXm@jjp=WKfiz zqEaX-k)m`IrKPB70~Ktb!VQ$#K&cFrw}C=>22%A%PC?=V=n@b=7qPL>Xb>5R&`<;g zAs_%M6}-J6mxEdWN+aph64uf5N}A52>1>)d&~!3QC)j9>jgGg`;Wj$ZM$fR(u&zVF zN|^JIodd%X=s(1wMVLPy^X4HY22oK636boGMnnsA4(R!kJ|m%qVX7FWlwk@P#=JT3B|ei%oH{1{bSyu@Npd(8Z$h80zX_cVOF2lvcu4 zj5TYJmxrt@EM6=biHk!-gk(WXf!zrCovA9u9(la2zC;{ zxO(39;lT&KG6$<)@wIC3(Ahw(v;Q@!dC&Q&?&+Q7F(Z$reQ&UOMYU75soG~<=u_uL84txynJYko&j-K4?jUE)Y8e!r8NzvBL+aWXS!$Xjjf z*Vb?C9#s77^T7KsoRG&2pBK_%D%rcf15g{)Q`KG0;#nJiJ#epNvDg>g?Ak|DFVc$g z)zuxp)jlGYZ-7jBC4nd%YACm-)w(l3lU+$9Dk6-iz0{<-_WVwqr%7Y5zgAZ9)|N8y z+rhH*ufi{mxbpQUOF?Km72kKomWK4FboLnw#4cMpw`WYf9h#W8|B~GH=E?NM2Y>2i z3R3HI1~mV&`%T)+fc@#?lYH0tgU3a&S8HFcZ;K{AdCV8J+=iSu+d%l#H4{T#YU7h< zazgv6M(oO-f2FEht#$S^BsmeAR1Il~gt)9Z&@rFWQ{Q((HBT~hZy7&Qss literal 1257 zcmWlXdrVVT0LDMWLO}}J6=-?%^2#U#5Yd&Y*9$bQmH=JBs;qD$F^I6C!HIIiuJ|7K zME0nTVgFH8(qd@x4_GBa^Hy;*ebko?Z$-amfl%XiLRmvfmW zI4T%`Cf{Kzq3cIFCP2taT!LPMd|A|e7&Q7{^jkbtBQVM;|>1~Rj-zzoYG zupA|T<$_smHp}T*PRDUE92duNCXP$vxGat{bKD}1LG}f5JA)lVw@mm z3Zh9AEuxq!iY`$s6~#(XtQEz2Q53146o71+Zk~oW7?7Aa9XmT4d3h)(z={>{tVU%G zHf(~h6+4@8pbcI^3G)(zmzcbS^^z_*gglr|GnUFR@2=z-INc*PCr?u0< zQ&V9!!)k@o36BR=RjBeh4d=f?LlZ-wo(lpaMHP?TXs znNSqv!nLd}dWK(piF5h;^<&w8(tS(5Ezd0+>%Uj@)vmbNs?oEhJ!5eX`t}#szKUs# z_?A@nJ+?TrEmzy)`(9Nwl7A5;QRpuZ1=5HY1<(CJq>qmzi@y zorz<6h7Z*~AKYRbZ;Y-8Y~My6-tfEHzvI8C@z5=ee%AgwdsALKJ91=WeNWc=rvp8! z@7mke@w;N*-G36aRI^+cPXa;;dRt2}KKh_PyMXjyu0R_nD@s0yfbca z$#>^W?&5|m<&W%n!&&#cGp25>EBT@8g6sCGXN6}v64;eh8R4(Oi@J_aTJz2-t&_ix zcfM`*y|I@^`!+kuUizNzSJLmk);uxVAB5F>F?ZwfType) - ); + SunFrame = CaptureDrawable (LoadGraphic (SUN_MASK_PMAP_ANIM)); 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, - PLANCOLOR (PlanData[pCurDesc->data_index & ~PLANET_SHIELDED].Type )) + SetAbsColorMapIndex (OrbitalCMap, color_index) )); DrawStamp (&pCurDesc->image);