From 632e1e21dcb2bfd0ad57382896bc84a13724f4ce Mon Sep 17 00:00:00 2001 From: dP Date: Fri, 5 Nov 2021 02:48:01 +0300 Subject: [PATCH] Add 2x zoom for client list overlay icons --- bin/data/cmclient-5.grf | Bin 134881 -> 135130 bytes grf/cmclient/gencmclientgrf.py | 18 +++++++++++------- grf/cmclient/sprites/toolbar.png | Bin 2845 -> 3655 bytes src/citymania/cm_client_list_gui.cpp | 4 ++-- src/network/network_gui.cpp | 4 ++-- src/table/sprites.h | 24 +++++++++--------------- 6 files changed, 24 insertions(+), 26 deletions(-) diff --git a/bin/data/cmclient-5.grf b/bin/data/cmclient-5.grf index 8ee4f24b9710b09f410f82ddda4118bd7c969a1a..0232d3691670e596fca4ec928427523920cd9828 100644 GIT binary patch delta 7168 zcmaDjm*dua4sHep_aL_>UM?xFnvLATjGNUNIT<%sFqv{pHf3_&yn-u}XLF>ui}>V5 z12a|@1_lPb$qoAAljZffChyl1sApwhU~pw%U|?b3X5eN30cHjUh8N5i*dFjO@~`0D zA;iSb|A6%Y#|>^~etyOW!Y{;LNHQ|skiWsTg8M-@Gb1D83+4yhCv$yb*Xp`$gde(FpC6E7%wq7@R>4!tmV-9%g=i{tfk92Y7C9 zGcvB=-l4f(>L=3CJuo&s|_!z;i=_`Tzg_ zFPJ-&FNk)C9}u0Ow?T}Nu_Nq+*b4Cuv5wphoermtS&WP`#7-Q0A-bdW#x;;{H$2#& zF=fTW6{}V}+;R2AjSUYw#5#OC#5$ZH%1>I}IB?_W2CfdV6Uyw9XBY<6vokO-EW_di z76x!MFflTo;6EY4apuhF)2C0LI<-RLg~$!j2jYyU4(Q*|WIlQF=GM;!br9+$f*5Mw;?LiB;y4BZ>rAm7f=V?41#^n&XPj~CvI$2W*R+;%{;bJxUk9Ft!g zM$~gKFfd%j;^+r#pp?MVA=V+u!oYau)C%1L7AwRU8DA)0@MmQ_bNa;b6WlDP7#UAr zu-qWV%y{PH1F;7IFSMCXp1h&^!1RF*_FTF-4kMr#~-*~m@+}^z=9pl7qkzYIpDkkl$O3T zF)+TE#B}1si|LHVA8;HHdszUA^9yV{Ygidioj!dUlphYJJ^1qA!v(e-d5otXL_CP; zi0Fu5WZ-0AUr`3T`&WlP6A`IR1d;Mdpi~3v3|i6<9pa$^eP71AGTW z*&xw1LHva%>q!upA$~ygh13dHM#deYpwR9R1IL5Yi?xiW4umrvpV7*AqC@n6IP-}U zCpxs485vJq`1HV?{UFnecg!bGAAh0Ea{A<{Q!f-2++aF&`~=5Kz71~=h&}ke<1OQ< z7r8sWgR=-IK{`!{c#(GF2Gfb-FE*Xvx_I>B=@mR&lN-`ZC*Lyq#R@77%qAO#7*4h` zF|woAWKW z7+D1v7#QA67Hkrqe85O%vZ=Y;o4&E0(QxxjYY#?NVFm_< zVhCT{)|HV-gkieiD@Liw1x`|vXIcwS4s(^Ce8lbsqv+RcTM&-?c{<@5eDw7$Dr6)VIHBAoi;h6k0ihr_kU@xQU=7WLS zjEriV-v-$;GOACG50%~=u!5CwvTvv$qsHd=P(wyW&CL_T>=+rfCQl5Lo2=i^Kly+k z&*aXCRz~f~1?!|I2drqBye@Jns}2JLgB{pe3j!uj=7^ris>{H@U^)3?kksUa>f*`T zG3y!iCjT=7If896U+|2{Q(~J~^%)o#bU|vit4(4QVPt;3$6#{*=IH4Y@)>O=f9R5) z{4c(O)sTUKL3^@cNb__BZN{qUzF!&DCeKUcW;B8+HJN;%M|!$t9Ag8kF#`jG@#Mrq zl9M0I2%fBvVK=?czP>B;|cttR_q#!fzzQq5>OnXy=IvR!`UW3eM6t0MyggF8t7=7bVMMph?qy_k4Na`XC92}VX|n4jUn!{`Ev zw#fl2a^S(EF3o;5!X0Enlbe}BHCp|f~ z`V6DTt2u7dH zf(`79tiJHP6tE&^@`A=3M!(6tO}|+E85kITOcrc{q=2*SGLyG92QdarzAy`7Szbr~ zROg8L!$rw5L;#9fG z=hA~FclWk1Mokvzd(Iloz`*cj^2M1_;FORs*=F+Ueh*aT|9@eVDiK;*~z`@W=~dH+QwQ4&h!Tt6i-%Ic9OLS z)X0JB%~*bhwHTCbHXDY>Fis9#Da;CLwdjBqKy3A!EV`k*RS_^U%N&%xV`Sw;J#yVJLLn>hE zp#_Z8*jSk)fpL^ zpcxh9c2L;$O#ZrCh_x9>p~vLBJx^F$pd|>{K&i ztbI@qOHKE`!`L_3wycY>9}nsKahR<+yujboLPQD(;ID4{SgY4w{*I%*D zVPIfjo*dXAIr-g{#K|5vdsyc(K*~Gu$scaMVx0$SA%W$4*EvqMyuFrnJ~SgrPQHIV zVsgx#DU1s?f4sxP$hdIwzq_9p7ft?n?ub<9g zT?H-xFV2*lT(CE6a?BmB$*j*y7*|ggY>=Kl;WlH^ly`ka6wgj}zgh`A)v~vYmAuIMgAg*-gInPI>Z^SBcd%85kJ2Kt&`(HS>oltXsf!1ISZ;cNqI8+m^Yo zFflM}1&7i$1_p-bV7DO^NE%!$JbZk7y^DG`ZU>i4I~W)k3a1;UF-lHfz{w~uIrrDr z>9HFag(lm5ZDHIw{eu9b^yYhCV;EU?F)%Q6z!g55Z1&$Hlxk- z1zQ=pCa?H8opH}*hhOcCOnVuo8)h;}O}_W_`s7`IS{V0jw*Nbsk##?cHj~No{;y;` zz`(#z1UDY;4zB4YjEudk2N@U`>cO&;AAH?AeGU`j8rDM$3=Dl>F_6pOO%GvV>|#8; z{XPq0CnM_-1_p*UxFpE9W7A{U8E3H`Wnf@v0ZYJ4Ql9>WgRzhG7y|>t1hB;R1)Pjk zj7-Pjj_2EcQ=QS5k@W-v149G5)ma?@lP1-A2uForWSor9XEFUGi< z@%&_mU((YQ7=@<`$TBugpD)O0GJT&o;}X^j;NXIpb!B>}Bx5_{#qD<`8M_!+FM%aD z)-yIwH)vygIQ@bQqaf>L1_p*wknLLA1!Nih7#Xi@kC$U?Wn=~Q(K@y(sxdM%PJg4o z*ui*h`h6D0c97QS>ETL@%Neh4|F6V2fsygX_6aJCJ&cSux67(APGn@f1xg-r+s~>q zMl!PA#u7NJcfelWSkDMfAom#WZs*rwEMjE5H+jE@^!B;BjB1Rm_d#X;^obuBC8wL3 zFrJ>iMxQZ=@xk{0`i#kptPdF&7#ycBbY?s{UB`&Ap7jv}149Z#@qAszQ`7g`F|tpe zWz1O1`j~-%!4oXA-PDB9n344fxSs(w_q_w-o9RVnj3um3LG=O1ysgt0m@`gfea67R z;0@8`Z^3BF$oiatfgu(w0CLUN>ETw4lUQGX`xr2zzD@sY&6vUZ671oH&WvEAB&S>0 zGR|jx1rBAfN|^hmvc5(Lnwl_fov!Y{xQg`+0|P@3*rM(49T>|PS>J*Rez3sgtsgGK zD$#e_=Q=a$FtWY}wdFw$KR;dmD`N=X{0VH_pq$Lpzj*ql58MB{GU_ohe%!9-&S=cY z^oe1*LLj5;_683|VMeCU4AU3>W|W!!Uxra|I*$nB#Oaa#j5gEzy%;@Mzkn@W=*)O_ z`buxcRK~B{`F$AO8JWI;drY#RgnD|qgCAog>vskQ2A}DP;fzwC#0ocO3eyjU?eF~= z^%j3C61F&w?12GyP`R-XF~9$jJ1EVd{P+sp%6G87n3q z2=Sf1F_bZd^)CYhgFVdPiPO&oG8#?)9>$o;^p9bCTsWf-BkO-~)WWUa6U=ye`jSY- za3%)E>H6-BvY-?w%*cFyH{*82&x~4(OiW;Lsp$<17*|YBaA6bxhZ*nm39RrSW1g<~ znXw4wRS(%bzKKna|Uk%6HRR6s~gcbLz(e0pvY z<6%bj?S{#WC5)^bjL-r~YWn#(j2+W`QW+mGa&Fg6V=QH4;$oaWQH4=z`h#VRtkdIX zF)p1xvxL!n`uq&W35?v^4KhKo&%+4n#u}zEBJAgwJ~^AQpOu%9fuROu@A~Q2au_eL z@-ae-HiSDYr!UQ8>}TZ%yKrMYW1&kY*1Q7OigIp9eeOn>p6jnj7GQ%{+tJ77A z8P~H4F)}c;gDij=IJ1QDB$F`X^p66JQrqiF8Dkh3MYcCiW-MZ45`~B&1#J8`MxW{b z&oQb^zo*TpFnx0+qY$GQDA=Zhsss~o3CJW4)+RH#CUg?04C|j>S;J__C;?I?J$-)% zW7%|@W=6&7skMxUSS1-57;2{*b}??B{iBU5udaOw06>jf@XjWf(!_t6>+T)UOK0_o_lQ)aZ7&eOp-omBx6I1ob?Oi$`$JjJ944o8{kb}fwart42+7>0#*%j-L`(lVn!xa#>ozUrKUTy zGqO$h>tb9q-FzbB1y(gkGVEfM0`=LW7#Y)Jf-@O)85wn^FZj(U4Nh*`<7Y7{GcxK<7o5o`Jv|_wv39!j9LA}P zdfPY7VRT?*)Sq7Pi&1*IUjpNd>8DpP%1l2vk1>JKV0vFL)Bs3&)m+7>J6&V}V*slm zBLjm8s2tiqU1K3*1*6gSg$o%S8Ci`P85ry*C)$Z`|F?)yn~~Lok%7Sj#0NVAWXk2~ zvP&6bSWOuj7@R={Or9<^htX`h`!dE_Rx?Hh25*q+?GKhQnlrMRGcqu^fcS8i&0w`) zWMJ?Ciy`un<|@WMCQC?e2PIW8&>)8uC~HrL4RA17L!^9$+k%3_cNa4Ndz55vN zvbr%cFq{DK!6rVRUT}c%6stQU1H%=NAlS5L)BO%Ho?!K0WMDW4GmU%t+ry0i89leZ zJ;HdAk9+De9IcZ$iT2_dgEP2@yXC0)bt}4866n| zryJe@jkz7S1$F5_JusH(^_LipS%bh~4blK=;HFMDzRYOL7(Bi3GUFP?km+()7>}`r zGBPkM0-HJQDq|mG*!2FZjQbhGr~6-HT+bK*F&NTwrXek&1lCOhhoSA#(0qBYZw!z-@C&&k1-MCYR}0B5)7t)yUS?In#9P!Fbiai`{aU3 zspiYwO_YD;_fnv8KZm$xVNEkMa2QB~KU=7&E3{3}KYsuJDvmlaV!(k%7S< zV$8{BjMo{nwl93nXu!yt&B(xD1`-GB^qn60j3XjiZ%#M-z!=R~xV`rSV=N+D2uMh1o`knVreBUqT?SsNJ{7+gU??+YE9v6p7Ux85vtaK_E97X^f-|R8~b#_PNhL`RC>XtnG{p j47wm&z`4wC`b=IXVaAT>3!gK3Pv5YBv0{1wA5$R!z*tyE delta 6690 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 diff --git a/grf/cmclient/gencmclientgrf.py b/grf/cmclient/gencmclientgrf.py index d527e177cb..cc37d83792 100644 --- a/grf/cmclient/gencmclientgrf.py +++ b/grf/cmclient/gencmclientgrf.py @@ -13,13 +13,17 @@ gen.add_sprite(grf.FileSprite(toolbar_png, 0, 0, 20, 14, yofs=4), sprite = lambda *args, **kw: gen.add_sprite(grf.FileSprite(toolbar_png, *args, **kw)) sprite2 = lambda x, y, w, h, x2, y2: gen.add_sprite(grf.FileSprite(toolbar_png, x, y, w, h), grf.FileSprite(toolbar_png, x2, y2, w * 2, h * 2, zoom=grf.ZOOM_2X)) -sprite( 0, 44, 12, 10) # hq button icon -for i in range(3): - for j in range(4): - sprite(66 + 20 * j, 44 + 11 * i, 10, 10) -sprite2( 0, 82, 11, 11, 0, 94) -sprite2(12, 82, 11, 11, 23, 94) -sprite2(24, 82, 11, 11, 47, 94) +sprite( 0, 44, 12, 10) # hq button icon + +sprite( 45, 67, 10, 10) # host black +sprite( 45, 44, 10, 10) # player black + +sprite2(85, 67, 11, 11, 97, 67) # host white +sprite2(85, 44, 11, 11, 97, 44) # player white + +sprite2( 0, 82, 11, 11, 0, 94) # competitor coloured +sprite2(12, 82, 11, 11, 23, 94) # host coloured +sprite2(24, 82, 11, 11, 46, 94) # player coloured innerhl_png = grf.ImageFile('sprites/innerhighlight00.png') sprite = lambda *args, **kw: gen.add_sprite(grf.FileSprite(innerhl_png, *args, **kw)) diff --git a/grf/cmclient/sprites/toolbar.png b/grf/cmclient/sprites/toolbar.png index 08fb9cee49d3445e9d3a1f4a032974d28fddb8aa..4df996e7c0492a73b7918c88394095c664382635 100644 GIT binary patch delta 3197 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 Z#e STYLES[] = { {TC_SILVER, PAL_NONE}, - {TC_ORANGE, CM_SPR_HOST2}, - {TC_WHITE , CM_SPR_PLAYER_W2}, + {TC_ORANGE, CM_SPR_HOST_WHITE}, + {TC_WHITE , CM_SPR_PLAYER_WHITE}, {TC_SILVER, CM_SPR_COMPANY_ICON}, {TC_ORANGE, CM_SPR_COMPANY_ICON_HOST}, {TC_WHITE , CM_SPR_COMPANY_ICON_PLAYER}, diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index e962dfa1dd..ac1d404041 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -2142,9 +2142,9 @@ public: SpriteID player_icon = 0; if (ci->client_id == _network_own_client_id) { - player_icon = CM_SPR_PLAYER1 /* SPR_PLAYER_SELF */; + player_icon = CM_SPR_PLAYER /* SPR_PLAYER_SELF */; } else if (ci->client_id == CLIENT_ID_SERVER) { - player_icon = CM_SPR_HOST1 /* SPR_PLAYER_HOST */; + player_icon = CM_SPR_HOST /* SPR_PLAYER_HOST */; } if (player_icon != 0) { diff --git a/src/table/sprites.h b/src/table/sprites.h index c23776df8e..954a9c6957 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -312,21 +312,15 @@ static const uint16 PALETTE_SPRITE_COUNT = 1; /* CityMania extra sprites */ static const SpriteID CM_SPR_CITYMANIA_BASE = SPR_PALETTE_BASE + PALETTE_SPRITE_COUNT; static const SpriteID CM_SPR_RAIL_COPY_PASTE = CM_SPR_CITYMANIA_BASE + 2; -static const SpriteID CM_SPR_HQ = CM_SPR_CITYMANIA_BASE + 4; -static const SpriteID CM_SPR_PLAYER1 = CM_SPR_CITYMANIA_BASE + 5; -static const SpriteID CM_SPR_PLAYER2 = CM_SPR_PLAYER1 + 1; -static const SpriteID CM_SPR_PLAYER3 = CM_SPR_PLAYER1 + 2; -static const SpriteID CM_SPR_PLAYER4 = CM_SPR_PLAYER1 + 3; -static const SpriteID CM_SPR_PLAYER_W1 = CM_SPR_PLAYER1 + 4; -static const SpriteID CM_SPR_PLAYER_W2 = CM_SPR_PLAYER1 + 5; -static const SpriteID CM_SPR_HOST1 = CM_SPR_PLAYER1 + 8; -static const SpriteID CM_SPR_HOST2 = CM_SPR_PLAYER1 + 9; -static const SpriteID CM_SPR_HOST3 = CM_SPR_PLAYER1 + 10; -static const SpriteID CM_SPR_HOST4 = CM_SPR_PLAYER1 + 11; -static const SpriteID CM_SPR_COMPANY_ICON = CM_SPR_PLAYER1 + 12; -static const SpriteID CM_SPR_COMPANY_ICON_HOST = CM_SPR_PLAYER1 + 13; -static const SpriteID CM_SPR_COMPANY_ICON_PLAYER = CM_SPR_PLAYER1 + 14; -static const SpriteID CM_SPR_INNER_HIGHLIGHT_BASE = CM_SPR_CITYMANIA_BASE + 20; +static const SpriteID CM_SPR_HQ = CM_SPR_CITYMANIA_BASE + 3; +static const SpriteID CM_SPR_HOST = CM_SPR_CITYMANIA_BASE + 4; +static const SpriteID CM_SPR_PLAYER = CM_SPR_HOST + 1; +static const SpriteID CM_SPR_HOST_WHITE = CM_SPR_HOST + 2; +static const SpriteID CM_SPR_PLAYER_WHITE = CM_SPR_HOST + 3; +static const SpriteID CM_SPR_COMPANY_ICON = CM_SPR_HOST + 4; +static const SpriteID CM_SPR_COMPANY_ICON_HOST = CM_SPR_HOST + 5; +static const SpriteID CM_SPR_COMPANY_ICON_PLAYER = CM_SPR_HOST + 6; +static const SpriteID CM_SPR_INNER_HIGHLIGHT_BASE = CM_SPR_COMPANY_ICON_PLAYER + 1; static const SpriteID CM_SPR_IMG_COMPANY_CARGO = CM_SPR_INNER_HIGHLIGHT_BASE + 19; static const SpriteID CM_SPR_IMG_COMPANY_GOAL = CM_SPR_INNER_HIGHLIGHT_BASE + 20; static const SpriteID CM_SPR_IMG_HOUSE_NEW = CM_SPR_INNER_HIGHLIGHT_BASE + 21;