From df725471d5fcbb614647ee131dbbf25f7b37725c Mon Sep 17 00:00:00 2001 From: Justin Marshall Date: Sat, 4 Jul 2020 17:29:28 -0700 Subject: [PATCH] Moved trans hash mark icons to PNG's and now render properly. --- code/redalert/cell.cpp | 6 ++++-- code/redalert/display.cpp | 12 ++++++------ code/redalert/display.h | 2 +- ui/trans/trans0.png | Bin 0 -> 2428 bytes ui/trans/trans1.png | Bin 0 -> 2428 bytes ui/trans/trans2.png | Bin 0 -> 2428 bytes 6 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 ui/trans/trans0.png create mode 100644 ui/trans/trans1.png create mode 100644 ui/trans/trans2.png diff --git a/code/redalert/cell.cpp b/code/redalert/cell.cpp index d8650f6..786ea96 100644 --- a/code/redalert/cell.cpp +++ b/code/redalert/cell.cpp @@ -1262,10 +1262,12 @@ void CellClass::Draw_It(int x, int y, bool objects) lastRenderY = yy; if (Map.ProximityCheck && Is_Clear_To_Build(loco)) { - LogicPage->Draw_Stamp(DisplayClass::TransIconsetHD, 0, xx, yy, NULL, WINDOW_TACTICAL); + //LogicPage->Draw_Stamp(DisplayClass::TransIconsetHD, 0, xx, yy, NULL, WINDOW_TACTICAL); + CC_DrawHD_Shape(DisplayClass::TransIconsetHD[0], 0, xx, yy, WINDOW_TACTICAL, SHAPE_NORMAL); } else { - LogicPage->Draw_Stamp(DisplayClass::TransIconsetHD, 2, xx, yy, NULL, WINDOW_TACTICAL); + //LogicPage->Draw_Stamp(DisplayClass::TransIconsetHD, 2, xx, yy, NULL, WINDOW_TACTICAL); + CC_DrawHD_Shape(DisplayClass::TransIconsetHD[2], 0, xx, yy, WINDOW_TACTICAL, SHAPE_NORMAL); } } diff --git a/code/redalert/display.cpp b/code/redalert/display.cpp index d7ee626..4cc5dcf 100644 --- a/code/redalert/display.cpp +++ b/code/redalert/display.cpp @@ -87,6 +87,7 @@ #include "function.h" #include "vortex.h" +#include "image.h" /* ** These layer control elements are used to group the displayable objects @@ -109,7 +110,7 @@ unsigned char DisplayClass::WhiteTranslucentTable[(1+1)*256]; unsigned char DisplayClass::MouseTranslucentTable[(4+1)*256]; void const * DisplayClass::TransIconset; // jmarshall -Image_t* DisplayClass::TransIconsetHD; +Image_t* DisplayClass::TransIconsetHD[3] = { 0 }; // jmarshall end unsigned char DisplayClass::UnitShadow[(USHADOW_COL_COUNT+1)*256]; unsigned char DisplayClass::UnitShadowAir[(USHADOW_COL_COUNT+1)*256]; @@ -190,7 +191,6 @@ DisplayClass::DisplayClass(void) : { ShadowShapes = 0; TransIconset = 0; - TransIconsetHD = 0; Set_View_Dimensions(0, 8 * RESFACTOR, ScreenWidth, ScreenHeight); } @@ -232,10 +232,10 @@ void DisplayClass::One_Time(void) ** Load the generic transparent icon set. */ // jmarshall -// TransIconset = MFCD::Retrieve("TRANS.ICN"); -//// jmarshall -// TransIconsetHD = Load_Stamp("TRANS_ICON", TransIconset); -//// jmarshall end + TransIconset = MFCD::Retrieve("TRANS.ICN"); + TransIconsetHD[0] = Image_LoadImage("ui/trans/trans0.png"); + TransIconsetHD[1] = Image_LoadImage("ui/trans/trans1.png"); + TransIconsetHD[2] = Image_LoadImage("ui/trans/trans2.png"); // jmarshall end #ifndef NDEBUG diff --git a/code/redalert/display.h b/code/redalert/display.h index 524cc27..2217eb6 100644 --- a/code/redalert/display.h +++ b/code/redalert/display.h @@ -118,7 +118,7 @@ class DisplayClass: public MapClass static unsigned char MouseTranslucentTable[(4+1)*256]; static void const *TransIconset; // jmarshall - static Image_t* TransIconsetHD; + static Image_t* TransIconsetHD[3]; // jmarshall end static unsigned char UnitShadow[(USHADOW_COL_COUNT+1)*256]; static unsigned char UnitShadowAir[(USHADOW_COL_COUNT+1)*256]; diff --git a/ui/trans/trans0.png b/ui/trans/trans0.png new file mode 100644 index 0000000000000000000000000000000000000000..de36efb48726c916573ddf38561b6e04404c5165 GIT binary patch literal 2428 zcmbVNPiW&-8h=Y!NZS+wn}VnKAY3nK!Lnsrwq;?ro<`X!i##=%h>i}1d6r%hF_C3k z(j*%2VHR}IA+Uzk!OQ00gBR+94>|adLJD*6LSSi4=L?o*qiq$alGl0 z{$XwXdEa~A`@Y}z`@Z+dt33GdtvB9z0|4;Wn!vB)cPO|QUc=9SeDb#w0A2$Xabp#W zgWw-L)-zC7qk9Z&4oCAZ1yh?S+7Bt`|E zV3{xzTPBHx>iA`~e^T8aRqcN8#N*M+V*t)x^u{CqXy6_mIQ@?9KZl-PX+z=i%Zrz% zh2DIXgQ$K0Y1}hrM3U z_kGXv+U<6;*+d9ct5s1HF^QOK%=>ua9-g%ij%{zKJ6)uCm^V>Gg@Q!Wd^F00LeZt^ z^k8}prXw)*z?YL(r)OV}j$if$C;R?U+Z}3lPu6^1@>rowmu!;Ni5LvUq(y>XSZ3V* z(Do0|b5GK3UWTk7Mrmf5i1M9w$+cNq59=@_i{VmfkzoKqj4r0_^DfDeERfDHfwARJnV z5{qPXiKdrX7Q-Y2fvi+$S!S!Sgfu~KO14vNKi6E(#`XL=>B*RS3tzL|L^XX?1LQ{*8 zk27Vu+*m=|n((ZJ9zJ`pp*(w{1dQb^fl6XI30v^rKl=%y@uV|xpJ;53ABTB zRJTm5o1E)5whhZLw~Ze#JzxHw159nXJoj-Y7G0maFs;?6IE)z~cWRp(P6H*@k!jd1 z1+6~CFy9TLX>cno1TCYrVHi6%iK^T{CQ>*Og8W#ktH!SRn_C+Y4=q%T1X-i#97Qu5 z$t;)7a2Y(#aWs9cS~gT|)45X>Yv;eGic3a?7W_$NRpB;`mJV^inhv*6qEX+95OW&2 z6=TO}VaEZw+w*HHE0vb9sqNqebN#~)h_%&~Y%-tCQmJ_I3U0Z~t<_Bn))lnI7bBRQ zxTdLGI+ahW2tg_XGkFTCOqR;$7#w!3hB9gfWmB+rv!6ED% zQ<*fAq+lL06pOMog@L)vd@di9{Z%D#f@b0zJF|oI5H)9`9gVmu9u6wOp(sX_pc;@G znN4eV@bR-e&-U+bBW(0Xs^r?cX>3}%u!Zh#VeWpi3KKsB-h@wo9Qw~o~AZ3jO=ud$m8XpFi}~kp1_i-M7I%*Wd1$;>N#% PZ^GK@1Ah3yfS0Nz;Qx!dR)37@H#(fjAGemDT&Wl$ED7m?Tvf8k3S zi6eB2Vpl{GKtj1Z3fIvXO?JDZ(P(CRdU|Gdb~b`Vqfsm#kK-hc<76U1(;UO#98MSU zM3G^TP|kB)9+nv-(3~OiJTLO1#6w9Gp}<2CLcxIo)FlVqjx0F}`sgln9mki-eqHii z!|-IsgKpq>z8;{v?Q{dD)p5FAS9UwT+m*bQyXCunPY(vZ?*)O^3ATE@E#L3AgS}4B z?X>p>{jJ^J!9o9Ecrtu(><$m=$NTzVSLt`8Zd+{mLdz+7b;f{-!0GAfa5y|VI@;gg@AY~+J3B!T_`ct4 zHtY2|giw}cK@bp$h-<|AVCd~0HMjR2zh}5@sQZXFL4f(ZNRnJUPDdi~nbBx_bPPs) zF!I5(;fuqg=l%VsJKck=V6W-*bZ1A>15WfAzDX7xoH4M35=n^D7&kRbd!3#WY{SRC zXgHjtFuV{a=~*n!wVFlGVH_iBC=p4B7K_s~4KS>KGHUMs#sx#%J&B8l5w1U*-<~1; zqjvL&ulMU>Pv+VJ;}ywzBCf=vqhT;QZoU}QPkZ9?o#L>CAG-FP3%Z?edM0c{1_G}fyYyIF{x*=5l}~GD zu`eVQVr#ZtV^gV(jg92ST+(c;rqa1wF0?^W1kxZZw`wb!MAf=}VS$5|+R$sZZdS3- zqEay(yAVT2&qFY36SGxoOcNq3wW-un=_DD3bf&1O6TO<#SU+>FsVTS)4Oq1;q??}T z*49khwAReOF+ExSlLJI;sWkC%B^JY&xUlTShbW9OAy;Z!%We&(ZbQp-8Y*0Th+tk1 zqp7hA4XD^=W7#y^lvS9jRaax!ghqD3TsIrY zaft5n{L;cgxnZv8>uABc{m}>5(&9oUoy%khDw#fmTPm?jRm)bYDqP|UF+@&M*EN>P zkSkUF_#f)d@==+<$%=G*d-3{(wi(DqYEB zDI%>@a)hSRX(Ff2Qv{@-R;kb{3)VD6wQ8NsOlP-*eNgsz*WV(U6bm5!hZPel4 zUE*#o<1O_*ypOK$E=F6`mp};3N*NH%(V>~$+OsCVO#l^*?<>loF5sgNPcsx$hBuUbV1jFzw zOY$UBCKF|r#X_~n^F>r;vB2<#BnW~eNV0%rNkXE4B!olX2NIFyrV9@U!jYoTj!;_QI$>d`4>fD{2w9b$9@gW@bp)66mv=ewP<=dg|uHDE**qvi40ZR8(+EFW zF77YU{#mc{!q-PFX{hi$k@d=SD-nnB=yVcH&pWTit;?bG?Lm3cCC}ZZF$5z4^jXj& zfkyyi2`CFd1b_uVdC`{+d*XpV9*-~1FQ!UJ-X#DR0GtAV6LAPY0DuR80{{Xb8d-=F zi)4I>rk7b3!z2WOtX64RW))aQx?r><$5lGdbW*PDWD0r2MA;qwdd zm%rlE^2_h^jYsyQipZ&^k%XFAL&;sEiM0VJez@C&>JwxWHMFTWO0j=^{zZ(?wNmWU zT!pSQSJ9R(JZqze&+c!i&z`6SE%xE>h~h4X4H(FV#ICX3u(;h)?8+{O$KiA;MqH`b zPfD?Sp+n+PrAn-tZA9dgG^NsXhFB>i(|IPFrxQem&d@13lS*ePI?d55TqZ-zt{C># z*6Q2?{`WIqSSrP~Y`e*&Qad|4$(?M{Y;UI0g+d{;k;zb4gRQ*ns(J&N$lyo_@>9K`nLE~RZf!t3v{5M*W{sj(D4N+w z=ecZ-%i-|~N7L7;6;spe?wzWI@2ldH(Vz`~Qdv{Ey4f}$4p=wfCQ3CMn=xWeBe!a9 zn{DhkM0b0BeRZ|kHtYH}Ua%f~{1LIfwwg~D@_8zgOkcsRRJiqqWy6Mw*7;HllathS zjZ15=rq!~D%G4Q+TFEm73Tm|iRmc^XY+b7%EnmOc&zq_fmO!}w`ZQ>!if#NCUQVM~ zn8Ovil0}HB)tD8kkk(iVsr5Wl%R`k$?2WZg+B!avaQn8^5S4~4*6B24*m{oA(hQ{7 zEW=VYTFp@^lc(#sg2raEYFPGHmBb0Ug>&rA4$?!^nvJ$~;;MK!sD_846jQ@$Kw4}z zt>3}N&+w|8J0-P^?6{bUuUeh9n;pZ+-XpO?yOOm{-RUA6xY z^cgMc7Hn)H++kC(Fql->i>{NB`hLEy)^7E!8+F_a!{NLOV`1LMQ3IQ9<1TG_zum$e z{{40S-UiuKzkZCbufL4H`)(u>VIzNh{Ac#>4+AaY{9|e79q_jge)ayoHGLTVC#