From a16c5f7df97a3d752d4c84b8cba1cfee180513cd Mon Sep 17 00:00:00 2001 From: Cyp Date: Thu, 22 Jul 2010 12:27:32 +0200 Subject: [PATCH] Show oil wells burning in the radar instead of pulsing. --- data/base/images/intfac.img | 7 ++++ data/base/images/intfac1.png | Bin 8611 -> 11841 bytes data/base/images/intfac_differentOil.img | 6 ++++ src/intdisplay.c | 42 +++++++++++++---------- src/intfac.h | 9 ++++- 5 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 data/base/images/intfac_differentOil.img diff --git a/data/base/images/intfac.img b/data/base/images/intfac.img index a79472dbd..400e5aff5 100644 --- a/data/base/images/intfac.img +++ b/data/base/images/intfac.img @@ -518,3 +518,10 @@ 5,32,192,32,32,-15,-15,"IMAGE CURSOR BRIDGE" 5,64,192,32,32,-15,-15,"IMAGE CURSOR BOMB" 5,20,86,179,18,0,0,"IMAGE SLIDER AI" +1,39,98,3,3,-1,-1,"IMAGE RAD BURNRESREAD" +1,79,133,6,9,-3,-6,"IMAGE RAD BURNRES1" +1,86,133,6,9,-3,-6,"IMAGE RAD BURNRES2" +1,94,134,5,8,-2,-5,"IMAGE RAD BURNRES3" +1,101,133,5,9,-2,-6,"IMAGE RAD BURNRES4" +1,108,132,5,10,-2,-7,"IMAGE RAD BURNRES5" +1,114,131,6,11,-3,-8,"IMAGE RAD BURNRES6" diff --git a/data/base/images/intfac1.png b/data/base/images/intfac1.png index 644dd262e462b952ca39817363028dea67adfbe5..a0e1e8610ce008a5a771b1ac02698b201eb1aae9 100644 GIT binary patch literal 11841 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 z zZyJl!iPNS2b2-0=_xgS%=;Rcy&Vcz1@;~wbH%YLp(|Zs0;s?-l`^I-Z3uEO`mqO-R zvt0Aa41Yk~$$Gw^PaFM@SEN_FF;9Y_&U{m*LnZUKK~vq7YeE0TB8u24HmV!EhC9y0Ctg)xza;;z+WzGn-}Q(}T~rbth?e8lhg^1Dvg=%_Gd{5y zFTaxZ-F&Z_+Er9Ga62A&0zurfcq4iFuP&-d1i2%E?Dj_3 zRbm@Q8Nv=>L{d#9U#B+nd%wWr3CA6s8x0)<@|lBpaQcl_tLR+Y#n-n{PZg+!VCWOE zjgx%VF`pSbHa2RAaKGCeq2Mz59VSkRWMuE`BU*L#k#^D(-~(hSN~eehhp}h${_>TwG@{H}ZZao40g6 z6?_lCD7W7ps_(n_DNMO+U|kWw&SeU#Qh>ICCPxMKV8Hf)U#WMtBOB(Ns^NCuCHTrU zUIQi0JQ)eQkgsJ1@U8X_g*rQu*Vq)mhy;ruXN3?<%pIwljCa!UoC1mwR%5#S0IwK; zN2nj4MR4gE9GOv{us$V)8qw}3Y$mo$=(8z{Szaia`OH+{PFI5aJeMIT%>xDwLq%^N zi$d2GXK1{H$Y<^^LBr=diyjBlY}3S1L)0_hCX*HZDe+#AJh41{gue$q|5-R#8D2&a z3OKlD#0_}N;vo!`E)Ng>09?dZW3BJ{Ev>?guDAcZ-$B)q~b5~-# zy;UdzXAEx~6kgovD=Cjt!Up4J3NyB4+#v5#nHW|Aas_EkYrtVlG^Ahu9~6y^`WukIHq}))33E6 zoO32@Yz~Gp;*Olp23}n}vgfF@(OeGa=V%UZ|C_4MjBn>c{0Se?ZXca`a6S5CzoTYdn!cosz4tbd z2bBS3IMl}HG3V}IYxYO^n#OXv*3v_xT%U>#EK*Z}Cw~?(a8-Y}(O`p+mZBx(fR%z| z18yBLu#%fTH2-qh;K8rPq&k43TF=MdiX$u8oINVE>Q`qpI$fo5&vL@@I~!y0)#m)S z_;2gCSZ#tbm;7$>c2*~~OurFK_#E0B_N6+0ek8I(pd)JjBiTb4?(h)|IdF74MB2`p zQhiHq85lGPc~iE_if?5$;Rf|~xxN}IrrOhw=6|Zil5^VpK=N4ho3E)#*!*n&JNr}g z^w0?7DU(w)H9Dn>r+9jMa~aS2cLR1CAyJ!~?S4c!;LEm?wUFU)G>tXv;mfA0YtH~7 zRN0Pl^1%)EiG{i@Lf*=Uk5tah@mbBeg}*{rp#lBZIuyhaUCR3Vuuwp9HNx&DDv(_< zOKLhGx!5RzpOZv%TY!Df5oq~hb~8Kg+a7#b+G~N$2vW5){<UvqgO({B>6T(fQRcSk^wi=2%=oAhk$v{ zYUlo=!Vr>JU)=95WRbW@SKxKvI~XbJ=nupJ*Y-gax$9|?FcEO(`;Ldj%R)VJs~oW9 z-tckUR;j1~xFt$f!@iA~I;;k0dxudT8*_KQ(7O&+YW#B(yf`(1qh+G3FN41cR5a2w z=nbsons7S|Yw6j`s3}sf?1hc2d=Fj%ykA{3y2Y{BcS$0^tC*R(mk%k!;`*2Eq)7)T zz~b1C`lXK{6K4zzPA*0nVx@J#&fLwOZlAN^PW)Dg?g)x;{_$@P!!bB-@36>cERrMw zKM;W>lmP=}KwEv5dy!}8GnRqE!Xngc)X=}Yn1UJ_N^j@hoEK~&dB!YH1TGG)eBH%mP0RK4R4Fh|(cUFKofZdjRZ+*}46f8qD9u5hysZ;6U8odPYj)9@9+6UjV zkKchMI#3aN?wHwZZW`^*0fy}KT$?%I{oghGRw#nZ(j#LeIU8)hj91N8tQdi{JH$YS z`E9|Mv)x-gqkn<=|KH?y@Gyvs>Yi*gM=w0g>GgHPgjss7kszETXm{45Yp>OrN48{b z?^m3qikf;!+P<{|wyy4TNNK}5wT5LQ0x*S5<(_@RTiy~(g|@K=WgTlo8Qa*)PMPdQD564Hu6>W9h+;}vQrS{Oj3q=_ z(n5)m7PQz3+2*I;|M!2M|M&O&&-2{pp7(vudC$4;J@5IP``$F$gJv9T!fXHl4hwS= zdjO!FDgH=67CppA?V;=I7_ZaZs(wI;iLJz1|HlnOa)f zQdN(+^bD*XyD1L3rNk<}>k;<>piED6{grw7Db)-)*8aWh!5?}qNb+_&%YfSe6cvRJ zX6xzcfr$wXajs<5*QTHnw+F1_qtYKuXb50XW27nC=e)EiJ}X zrCes>dY0qm<^A<3ii0U4H*VZun#m0e4CH!9Jq{GH^6>+ak!B8uJbLQy-@k8=Qo0fB zv2a&MQBm<508vp(~urXyF!(wq5QH3UDJ^;k~Eldm@Bi{c! zy5S@IuJ*XsVS!z>d^uP5$u2!LeAplzR(43wb*Sjy4oW3z$_VeUCleux@ z+Vbe~`(u~5jnsN-S}5$xKUZJAxK__FipxIYpLL{N)a7k2;aD3ZpFIXr^-k29Bs2_Z zFc2jvFz^o}+L5h!Fp z107j*!_;gVaAnqZV zV)g+e&^cnJ1SZ_`jnm06Bjtv1)7aRU3Ak*HWd8WG5uE|y`J$e|*JIj0O|o+!CYU^k zK6x_c&+21c@F6Ms&(GA&OaPGEbUyAG07DD79MM=O3>8GY{&L(e<(JGgkV$8vGoS?% zNfgNvUig}27}qtU_&O%e!wDO8hj0nNaR|ua>lKK@B6xa^8RA#KNn$f15)L%?!#ymB zd-#`R%HBOGba<21<0k=>N@dA14rBvW_ZHoAsmL*4gQ6op_v6ykd2M$&a<+#Zh`&ux z*_(b?(iURK;1^2#c4Fz5!KXovG%G6jRI!|eLDInLYYLN#fW`*kW*RnxoBkS*^%YiXEk@h z7eGXHh~N}{>Blb2WNb+zmt;k}ojaf{iS+4$3{)ygCdm%Rt!?Z=r-;42H6 z49NULxq&Z&(GUmnw6w@9BeT$a*w0~#54|-)PmQ^FHwV+kg~mhS z26|ithB^F9+f6*$1RFu&Qe&*?!*ko>p}R%vh~|`&0Fg#YZQ8T5+{=}-Ja?}d*|nzA zO@!@u5KuFy9U!n~N!YVY{w)sH4&2kuv!o9eVVm9!`tMVE#n8a97uZBy!a4!+cF~!! zzf-nqbH7QSIXHJ4$&CA;QC_UTHWNTvD{`ewzw^=56Px6X%w{ zz;O+`HJ+3c>n8g9!sBBS2(OffVxl8T)SEvs|D{+1e(v{sSGZlD!D!YlC6_ZlhHn+y z!6%F*Y5YcxkOknu`X}W`gLH9jz@~XzDbXA=`1Z^VX=e0Ju_pj>EOqu9 z>QExTn*X!=zz<{f&&!4$!O5<$wPtC&LR`lIjuyMDMz~MrcUznjWKX-K48HlM?gKEe zO1hom_tuL^Gkm=##km$gj|QPJ1gJlCbLXLghWl?yLy z?CwZe!`I9ASW1$hnuxqt0*^C^8(!QvAtaq1H{$QjLqGO;4qiWe@-*4=E;#N=SX@>z zqOz2Vf=1_pP5pjbmkxPWz%r?JudStyqD!!?OZJginiJYuJd|WqOO+R#ifMDNSRDcK zEVAi_&jaorM%a5)m{)dzg_?8vbjtN$Np!P2kp3y1$Quh{(ax ziS~rx-TD>N5n%QF!P4h~Iuor?R*yZbuTwsBhX_X=I~h^P4Q!7;RDJCR$W^}{pe?mx z8y`K=Zc*)C_~sC0FX#3%WQ35yDJ7mx8`yhRyY)o4r=+LIKakb#?Uv9vNBCI;el$;< z3e1Sytvz~wn3y?ys~cWr65=e?pt^#7o29teR5E-cqvFM>`PZfFi}YwW); zAMPQ^B1-x2HiYo=)Mt!|vSBteh-FPbyXAB;}w!qB|7gysLI4ar8k4DtXXBO9IrOKEM5)!mD zx&ZzCdkHEhhm&OXr&E z0HfjHKbUz&NA&Q;DI*OHDpYNp)Er6zjlB#ljFRFRa+?O*Mww||j+KrpYi}mQ|JnKq zCkEaj+j_bTVn)2d!i?XNI0oQc#UE7PKP-tytp(P3fr=e=tlviuAaTBQ27`8A$fnhE zJAspjskK98O)!HM{}D*pEqWeH-n9b|bCU%(?d_!xzOMTXRgkG!DFHBl@41925wq~F z!MN!rVaQ1xn)uX5OMon7J%t!D8L_HbfQQ=_3u2$~3sMOGfitpXyy*YN*~y<;P|Zz( z*zXI<|9DniO_0GvY&e%A-Vd|ht1eXaAt#@uV#shF3@o5M@v}Sqagi9;o->GDNNUFI z@0mONnK|on%KuDmD7-_(gkmwY{|R$p8+!C^$h|e{!Vf&u56>cCZvo_X#c$*Mi% zekH&|@~Xi0FUJ>A#1t}#yKJNYic+dipLRqee+@`qQ3Zkkf`AheUai)~fzbpjpDb}M zqmG(be_#$<8qPMHF)#q;d@nYiYa*=eQ+xK?%h3KZ&rfS*C!}LIhnQ$K)N}vUg(mbr zkcHp*Z;*ZJTiJGRF%!vx(lHoJ4#s1e?KJ&kek9Qa@B7Sv&!7ujgJvYUc}iFfKQfI6 z5{v~f&*8y~#9a?h9K9#kW7w?vk74%zi(#WzDbMxsTdcsHb>gc1uC>S!;_CSuWu1~7 z4}4tddD9u16)2FcJzKZ3ZmWg@#LxTv-`wOm;JJe^k^dKACu#eW4IWv{0cZAgNsgs7 zhVTx;U=cTUj`b#X3FbwenbrATBOpg;VrF>kE-338BDML3;naNp9cV z23pu@$Grhu*puDSy>K+mK%Ev$Xu|6h6DVps4D-m$C=KDNP99c~BF|`5$l}sa_8_Ul z!+&#{xxFZ;`~RU?ynE3=ZhRpa6buX}VO>Y2RIM>IrMj|C3t_&Zr_q7?tTC|KiUuYJ z)%W3xHwc~ORNVTNadBv$brw%ulU{tCVucU~c0UC{pL?&QPFGjo10ub=g_;D+l%?>7 z_`2~PJYroz_>u-?TG@i@2QDkOZ`cY|`Su5;%~F1{o;luYSb|=l#SA@K^_3ud!k7SdKN@8|zun!mWd9FRt#!HpoHlc)RP zI&p#a9H;`0VrZ(%lTHga?Te3bcBA(1IG*92xUhWBQR$|glv*DL5}5RSupW0-Cet~i zbOZ`Hrt?i)?`mm%>-||B@-Nc?Q%*sUGn83d``6%s0q5iEQr3~GcMjdT_^J*Hi5{6G zCAUR>G`w>^r)+KW{iVlKSC{X{U!E7eLvB#e?mJv+cfI}!2XOq`EDM@R!{OJn?afp}#L9hsCwIa2H0afGk^y8d+1`lT^ox?8RUQwLJgVF06r9T8%^#J+2UHPx|Ik@ z5jKQOpPrO^i6z>At8fICCUqz#_W32e9a+%uq@{&|DNUUSrvVuam;_ugpgPdb_HJZ@ zJ$dzU1fMxzz!94px8GO;dlt`hM4hhO`Y9LC#oewE9l%|dff{x8lX?#SUXTztGd07LvYZHBn?NO-d0YA+Pu_;dod0eS}J*C=m&caH1mN2 zyb|L)ze^YNv|;$j95di{OiA8+#=w;+;Jb^=y91UP1F`V0Tgp#T>=@2R2Qdw^Vd@en z4seDYn@UzW`vh9BoOvpO{GQK!4}95>40^s0&7m9y63BRuVv=#hqlsblc1K8Bk_5

_?Y?BZAm`=uy`s8FPS60uWO;lQKYg{J~2Yf)~K##A6+TY*W}8i z+@DuaK`}P^EN4i@s7HQrXYIGaJz??JQ4C4*1DfaiZ;LP%&pOA?oJx#CdSB5jYo@T| zzXwiW(V_fCp`7$=JrsGi1Td&MVev)>p%CsFGv!g0@DCs-SM z2}Dj&z2Csl7oy|+Lr_E(;a9P|2u~6GY1t&sTLI{nbqW@;WX^_IIL29M$(MDSP9-UY zxn}xSr_R<8fy)6&GM{{U^flnCWfFB(HbU(zGKN=^GYT+Hl*0E(N@QNf;)7FDKlb*f zz<8GQC=UTJtE}cR&q6hq@o(t5m3fu0Y_#W()ZcrrczlkLmsU-)nRS@@I;eM;?`dNb zJ@WmH^H)fL-(O>i_mzJYZPDFuP_*{im-3fb!AXJeon4Kv`19fd%Wt%R0Tnb}?T-3Z zNFUcT3VGc@3`~5c>(&H%HB>6(T>UZa&T7#?EQZsY&Yx1WofHMZ&8LWv0JUH8Iy%Y} z2~W~1dBv}S^(rmU685t7b^cK5JMn*V?ITQHSfyJf%5w}-2yQa z*|yv`8B3-s$46FkV6QU0_Na41is#JlCvmUfo(eBS zTVT@XxK7G$)PV}!twX%+EiNhiz-XJ>>QX+6{JtXy_2M1=tH@1G>@qbL-J_Ug(Zzvnu+4^$jmpXX_}Mx!1X3mO)nfE!`Y9J|zc z{A)pqek;lQ8Cd<-3NC{dEF>#f8Y&O57BVj;aqs7NB1rkIS+H(gqz$I{m5l!_E1@VAxqgh7aWxiLWxoa4;x6I?qZ%FJ?oW7-17w3#`-UZ0&{L; z@$$;eh9quwaG3oI@-QBKuAILz4GSsE`CHU9ZhpX?zRfg}&@kpV}l3Q-xpPk(D}KF%{EG z@UCJtv9BOoEPs?; z-yD)w$xI~%>@`uT;NwiV4qsDNQ|9d&Zk%eqY#Z}ye5L~*do=D1Uwo6iDuZ%@y*_(OAZ7~+ZGrKL7%P!Wr!lk_us6Xi)ino+_F zDOlo(*sc*F+kWfo_de=fx#Qt>>a$8>C^y(c-uvcw?$IthA0WY(F>%*%a5;uyf8gqS z*+{FYmY>*~!0r`1oU=SQEne!cjeTwDV5Tf+b+YJs?#)f0>Ej#gG)5ohhmjJ-W;PMk z!IGMj4NaW^9aN>QCuas`Lt=nJ-e{?>v2Lp*ATODzJ5h9n@Ybxv-c=#1Z$YUqP(Y^D zH=#8Yd`bs2Nzm)UN|gqGk9ccXfHkU|E;x?MNdGYElq-jfR%;`zQ z&8q!n0ZbP_9{C{Vd(`UU^JOre$;sxKx#9?I?CjrI>~cc*{6sr$>fRg%=?zl>16pDO9}e8O zDdVhr!nyF}&KQ3c_Ehb(PLh6ru2nhD5sW zG?wUM{F$m;D?15V1@ai`L%nI&W6$xPLh$Y-|)+@0++z3RD%kxNuQ03 z&jX;sL~U~#IEqg9p=leog!WWlT%u3*343#f24HMGf1cJGt^|9VS!3GAK!vwU?fGXQ zVtccx4$r4GC_i>%k)Xp1oZi|~Wib;5d(VrD-xks5YzbE27Z)(%&PZ#)7qTD$qT#dl zM*Bx8B-X=?n$27GJ62M{o?->O=Gz3 zsKr(6{FsgW#ZQ$W z6(F2Ggj5qCx@TK;H-brX)y+)L9PCP5vp#?hiexQWsa#+t9>muF#=r32NpQ8G&gp8*|*EhcYdHkW{t1(tHZBYOnpL!g-joo_=J;%9wC+fAp533 zRaiUv#-DjmcgjyDU&pISBPTX4?bWR(Gr9o6h zRBF#l0%yco(N6Snv8*0(iceI^;*7CFWs|@z`bK?rgu=wWK@zftj3d*zd=UFgH~DkmLDjHq=gzK4ZT*%IlXU~2P`Z;wMW%F$1iP} zfDp=KJ~6RK-qkng*p7|yklT^ZUwk*Ngkn4^c{15tc#zjuhjv+E z)r{lMwu}h8sKuwVg<(Az~QD2H$7-N z9R*q^*<7Oj{a3S2x7v0YMF^-T3YQwUIL3t9lz1{ zI&$<6zxs8z=nj^?c4jt(x)u16`OvQ(YP?NgVCi2x1UlKTe!J*bZqBeze*VomS+I_S z$3<*VAdl#Jz>}F)fl^9@7{c9HaN9>`#prE7;soW{D8kWN_KydJBz_%d#CI zU0!P|Zmhex#1A-n`8OQ-1~GWBP1|eTipfYzXAQ$2k8a)nSp7Z%Y+jQ zj}nKTuy~FKD4)d1SFmm`R+Vh8mb+v(F{|C5+T-y!daTtTIc$xFK_Q=0 zrLja1xbve27DD5Z*e_UG!-ALH&c{O$vbs7wxDz zC{g6@V^K7ItpzgQw)(*j6oE6i2V8xHH(x;hN?fRXG~G#_WzkRb+ry^IVbHW9z2spn zv{ub*-Hgp=qsMN3`@(dCYEYj1XcaDG@Bq8!1M=!Oqwk2-EUetRQSY03^I3T8)l=Gy zC{GqTZhE!t@5}jrwg6o&W$-}BOE%=#PD?J3Kf*$toHToN)N7!Ak!(AkB8IbA4U>>wlQ~zw;-pLsnVj#SX~zmWGMFpRwQ( zRz9{jGU8PuUsMGUlIvWp(^G#C|H)o1E~M%_BqqQCsvBQ)vfo`kIVKNNcY$<3r!GHy z<@Hw|TKI2={Ch+eIvc{jlQg>@QpxR)dGq(2Qo1Yv)!A<+bOiiPPxlLtng@&5%rAA(5$ diff --git a/data/base/images/intfac_differentOil.img b/data/base/images/intfac_differentOil.img new file mode 100644 index 000000000..01031133a --- /dev/null +++ b/data/base/images/intfac_differentOil.img @@ -0,0 +1,6 @@ +1,37,102,6,9,-3,-6,"IMAGE RAD BURNRES1" +1,44,102,7,10,-3,-6,"IMAGE RAD BURNRES2" +1,52,103,9,10,-4,-5,"IMAGE RAD BURNRES3" +1,62,102,5,9,-2,-6,"IMAGE RAD BURNRES4" +1,68,101,7,11,-3,-7,"IMAGE RAD BURNRES5" +1,76,100,9,13,-4,-8,"IMAGE RAD BURNRES6" diff --git a/src/intdisplay.c b/src/intdisplay.c index e55b099d7..accec87a7 100644 --- a/src/intdisplay.c +++ b/src/intdisplay.c @@ -92,9 +92,6 @@ #define FORM_OPEN_ANIM_DURATION (GAME_TICKS_PER_SEC/6) // Time duration for form open/close anims. -//number of pulses in the blip for the radar -#define NUM_PULSES 3 - //the loop default value #define DEFAULT_LOOP 1 @@ -3062,6 +3059,11 @@ void drawRadarBlips(int radarX, int radarY, float pixSizeH, float pixSizeV) UDWORD i; SDWORD width, height; int x = 0, y = 0; + static const uint16_t imagesEnemy[] = {IMAGE_RAD_ENMREAD, IMAGE_RAD_ENM1, IMAGE_RAD_ENM2, IMAGE_RAD_ENM3}; + static const uint16_t imagesResource[] = {IMAGE_RAD_RESREAD, IMAGE_RAD_RES1, IMAGE_RAD_RES2, IMAGE_RAD_RES3}; + static const uint16_t imagesArtifact[] = {IMAGE_RAD_ARTREAD, IMAGE_RAD_ART1, IMAGE_RAD_ART2, IMAGE_RAD_ART3}; + static const uint16_t imagesBurningResource[] = {IMAGE_RAD_BURNRESREAD, IMAGE_RAD_BURNRES1, IMAGE_RAD_BURNRES2, IMAGE_RAD_BURNRES3, IMAGE_RAD_BURNRES4, IMAGE_RAD_BURNRES5, IMAGE_RAD_BURNRES6}; + static const uint16_t *const imagesProxTypes[] = {imagesEnemy, imagesResource, imagesArtifact}; // store the width & height of the radar/mini-map width = scrollMaxX - scrollMinX; @@ -3097,7 +3099,8 @@ void drawRadarBlips(int radarX, int radarY, float pixSizeH, float pixSizeV) /* Go through all the proximity Displays */ for (psProxDisp = apsProxDisp[selectedPlayer]; psProxDisp != NULL; psProxDisp = psProxDisp->psNext) { - PROX_TYPE proxType; + unsigned animationLength = ARRAY_SIZE(imagesEnemy) - 1; // Same size as imagesResource and imagesArtifact. + const uint16_t *images; if (psProxDisp->psMessage->player != selectedPlayer) { @@ -3106,7 +3109,8 @@ void drawRadarBlips(int radarX, int radarY, float pixSizeH, float pixSizeV) if (psProxDisp->type == POS_PROXDATA) { - proxType = ((VIEW_PROXIMITY*)((VIEWDATA *)psProxDisp->psMessage->pViewData)->pData)->proxType; + PROX_TYPE proxType = ((VIEW_PROXIMITY*)((VIEWDATA *)psProxDisp->psMessage->pViewData)->pData)->proxType; + images = imagesProxTypes[proxType]; } else { @@ -3115,32 +3119,33 @@ void drawRadarBlips(int radarX, int radarY, float pixSizeH, float pixSizeV) ASSERT(psFeature && psFeature->psStats, "Bad feature message"); if (psFeature && psFeature->psStats && psFeature->psStats->subType == FEAT_OIL_RESOURCE) { - proxType = PROX_RESOURCE; + images = imagesResource; + if (fireOnLocation(psFeature->pos.x, psFeature->pos.y)) + { + images = imagesBurningResource; + animationLength = ARRAY_SIZE(imagesBurningResource) - 1; // Longer animation for burning oil wells. + } } else { - proxType = PROX_ARTEFACT; + images = imagesArtifact; } } // Draw the 'blips' on the radar - use same timings as radar blips if the message is read - don't animate if (psProxDisp->psMessage->read) { - imageID = IMAGE_RAD_ENM3 + (proxType * (NUM_PULSES + 1)); + imageID = images[0]; } else { // Draw animated - if ((gameTime2 - psProxDisp->timeLastDrawn) > delay) + if (realTime - psProxDisp->timeLastDrawn > delay) { - psProxDisp->strobe++; - if (psProxDisp->strobe > (NUM_PULSES-1)) - { - psProxDisp->strobe = 0; - } - psProxDisp->timeLastDrawn = gameTime2; + psProxDisp->strobe = (psProxDisp->strobe + 1) % animationLength; + psProxDisp->timeLastDrawn = realTime; } - imageID = (UWORD)(IMAGE_RAD_ENM1 + psProxDisp->strobe + (proxType * (NUM_PULSES + 1))); + imageID = images[1 + psProxDisp->strobe]; } if (psProxDisp->type == POS_PROXDATA) @@ -3173,10 +3178,11 @@ void drawRadarBlips(int radarX, int radarY, float pixSizeH, float pixSizeV) } if (audio_GetPreviousQueueTrackRadarBlipPos(&x, &y)) { - int strobe = (gameTime2/delay)%NUM_PULSES; + unsigned animationLength = ARRAY_SIZE(imagesEnemy) - 1; + int strobe = (realTime/delay) % animationLength; x = (x / TILE_UNITS - scrollMinX) * pixSizeH; y = (y / TILE_UNITS - scrollMinY) * pixSizeV; - imageID = (UWORD)(IMAGE_RAD_ENM1 + strobe + (PROX_ENEMY * (NUM_PULSES + 1))); + imageID = imagesEnemy[strobe]; // NOTE: On certain missions (limbo & expand), there is still valid data that is stored outside the // normal radar/mini-map view. We must now calculate the radar/mini-map's bounding box, and clip diff --git a/src/intfac.h b/src/intfac.h index 1f0892011..5414b090b 100644 --- a/src/intfac.h +++ b/src/intfac.h @@ -549,7 +549,14 @@ enum { IMAGE_CURSOR_ATTACH, IMAGE_CURSOR_BRIDGE, IMAGE_CURSOR_BOMB, - IMAGE_SLIDER_AI + IMAGE_SLIDER_AI, + IMAGE_RAD_BURNRESREAD, + IMAGE_RAD_BURNRES1, + IMAGE_RAD_BURNRES2, + IMAGE_RAD_BURNRES3, + IMAGE_RAD_BURNRES4, + IMAGE_RAD_BURNRES5, + IMAGE_RAD_BURNRES6 }; #ifdef __cplusplus