From 8d087f82c7b66bc6c73c619700dd74c7d6cfff35 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 12 Nov 2010 22:45:44 +0100 Subject: [PATCH] less obnoxious icons, but still not that good --- gfx/menu/default/icon_ipv4.tga | Bin 1200 -> 1481 bytes gfx/menu/default/icon_ipv6.tga | Bin 1801 -> 1697 bytes gfx/menu/luminos/icon_ipv4.tga | Bin 1200 -> 1481 bytes gfx/menu/luminos/icon_ipv6.tga | Bin 1801 -> 1697 bytes gfx/menu/xaw/icon_ipv4.tga | Bin 1200 -> 1481 bytes gfx/menu/xaw/icon_ipv6.tga | Bin 1801 -> 1697 bytes qcsrc/menu/xonotic/serverlist.c | 16 ++++++++-------- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gfx/menu/default/icon_ipv4.tga b/gfx/menu/default/icon_ipv4.tga index a7334dd0560259f67c005bcd43f5e526d0e2047b..a0484f4e37eeb9aba750de55cf2e203b654cdb7e 100644 GIT binary patch literal 1481 zcmbu9OGuSb6ops5kPs;)DIC-wBnKMRKtd-W3K!C#7m5i%h=X!sI58Sz7Ud{rTZO`{dzib>;;3br5({wY%EL{-*b3MpAF1|Mm1(xPz?xwId^pAPga2TEID&?-i2 zd9ECd_Fe~LP5YC*Osg4YRm@U18cpXHb)j{)M*i~G$=!Wz(aIsR} z-*CcJpkl9-$a18*K+Tb^nFQZ3t-6K9YnXq@4oO{snk!W} zazM&oaCxLxwyF3PzI}t&E?M&iQq8}lju1xyKeJ~~GxsU_N0K>dC{#ONT8EqqQ~{=? zCK9;%Wo|9s&wx8}bQyaRbWmdKwV*)qFIcjrOF%_lDQ=nDdk{dFOA?Nlz7DvdnxqU8 zP2hWBKZVPtwI4bCB>sIINbdo+7zy_yVS$;|aVz39xOAUPfxw;mOc((keqR&P4Sb8h zXV(YZ{D7uNF}%rJ_ub$>Pf}Ey)v+VRu^(hfQnZ-R2Rur6g6!VJ=f1>!tH(bjo#62- z<9lE}xSFKsuxB8h0;^>Kb0*>j<=$)o9>^d0=@Lq_px%3yKMpu~Bev6C1}77FzeSCv z%Ns5G%HCO%>%6Ze2Isg$k7xFU5W=7r{Y8Hul)Xy=2Tq;$1O0*n2Z943aONj8 zF(0S3_Q8u>jV3`y_Pu-Wv(|pya|CvPwL0 zM%uM}wjsr}g5>|O!7{A#Hyeo`M5xFO6$x~mVIx3QqZ(0CRxp*730ilAq6=gQAFFBS z=o!&UDM0IYa)z)mPzy4*M4VF!SA5tCe>)WqWv&5H!h1e*lssAm1sG7`6s@)NO>U5Y z9*`wr;zMkaNh_`p*54ZXEq#_f%lCvhUpfQUMf;+pDdDVk991;q#t7{DjHG?hN{ib0 ziAE4&ls=Fna2iayLn|U`INLpaR%DLvDQ|=?lHd7q9b6a2;8fK7z-J)*lh$rHy1`YH zM$A#?37UBd9q(cIBb^pK&-V;yxF?+yc?AV%dO!n6(Es5`Spg_vg7N_r37R{Wu?%`% zL@83?32KG`x}#P{6G$?`&~Z%55e%R-Ny-o?S(?y42Wtd$VM>&_M&X-iQw!GV@mcx2 Qa#A^}W-bmYhvj{I1GaD;)Bpeg diff --git a/gfx/menu/default/icon_ipv6.tga b/gfx/menu/default/icon_ipv6.tga index a61947da785343cbb26660f75a4d2c07399d8f91..d3fdc03ee3e1cd4e6951e1b44beebd0d34b2111a 100644 GIT binary patch literal 1697 zcmbu9OGs5w6o&tMyy>x`fgo5HDaoWkNlns8G`fM%11ckmh7v)ef(Xkf&7e^aX(Cia zAr5*Cq(K8G4HFT>QP{}B%tU((Qfl|Db@n~gxPAEdW4->h*WUX`t5s>6#FyT-WdSsT zJ-u{gTkQa=uG8t7b=JE3=z=NVgJxTKw06cZ5C{>p2b94MunI`u!97s&NZwhH=jv9t zibbd*U{JFgzeQ7bl}>BHHt0b-s=&oOwFOqYfb;>>S%Ks%36lm8G!u<$Jk&2FBko{Mr+~GO zkY&3q>XmChA-xEKCZZ;R!jd$e~8$N#>x*3Xu9u$&A_v zF{2X@nB#UQTDA)jiB5W`QLJjgPurbq3abB$#Oq~;z7Yh?a!KnuB{HZE{Gy|$W(8lq>8Zw>~Ut{?d|k{f-`t$ z6`f7!T7k6|6VI9CBN)~0n0!H7Jnkc_LkXzCEd5`1$!l}dgyyP$Z~*^aYoe<4~l zF@B|jKXe&LlOEs}GY>GJA}*DeU!x1GvSWUS#gdv>+uv*wNGpGw?dMkn!@l9usHvZS z@93Z5^pp#}6lE)nX>|Ah`5Igc;53-^yHUoZ8w}!fmsIVjIzc0-Fb^>Ew5u7*!2kGn ntP)o2PSEHnK47N*>CE5Skwcy3qaBAk4j$NkY;VWDa;ts=mDQI}6vjX2O_u$&MXLx(x0NetVeo8GAVh*`1PLzMYoHsWO;-Ah{#c2dz&1iI z16NrsawpL)OtHn&g@_9aBgH3i`X!JkN< z8LfOsQw)f>ctuDcBs?>5ge2f)J=B;|JuOpsHXLO&y+f>Sm@HVtmHC&}!2A6qXCo+NxbIOBrqG`Lzk zNrG7)#$~~CnoNWDnt5%v;APFF!F#>)4-Z}|UG|2Sli>1wuVtC#`~KD~ew12l+Q|+u zlAOMsx}AP4aQexH-r`PrTOPWp@RAWe#d*5eMYqaDB-0BMWwb?i$wl+H#iha(+X(+& zGoFJTF5E(R$v;O-}8NIW~p+b8pN4Kb`lSgdn}G<_mpG*cjH_ct_gz0La3Z+)|h8PkxyuoX2cWR{5H za}~)Voq{^(glPy~4L%liJ7%`p1|KHN{e#$VU%cfT7QsuOC2t*c!nDGDI-AKBz@Il} zGv-;osPKFjK?Z?UlSQ3nbSWuwJV;#p2uySqmb^aADsZa*Pvx5&BdCE{FOODleklx^ zFw!TwtVa~r=D!X0vrq}$@JojnZid%DY1RT*{re4hn1Eie9I;&!rj#3h%g0=i3Bp8} t2ow8xkQVHSHf-cKrTZO`{dzib>;;3br5({wY%EL{-*b3MpAF1|Mm1(xPz?xwId^pAPga2TEID&?-i2 zd9ECd_Fe~LP5YC*Osg4YRm@U18cpXHb)j{)M*i~G$=!Wz(aIsR} z-*CcJpkl9-$a18*K+Tb^nFQZ3t-6K9YnXq@4oO{snk!W} zazM&oaCxLxwyF3PzI}t&E?M&iQq8}lju1xyKeJ~~GxsU_N0K>dC{#ONT8EqqQ~{=? zCK9;%Wo|9s&wx8}bQyaRbWmdKwV*)qFIcjrOF%_lDQ=nDdk{dFOA?Nlz7DvdnxqU8 zP2hWBKZVPtwI4bCB>sIINbdo+7zy_yVS$;|aVz39xOAUPfxw;mOc((keqR&P4Sb8h zXV(YZ{D7uNF}%rJ_ub$>Pf}Ey)v+VRu^(hfQnZ-R2Rur6g6!VJ=f1>!tH(bjo#62- z<9lE}xSFKsuxB8h0;^>Kb0*>j<=$)o9>^d0=@Lq_px%3yKMpu~Bev6C1}77FzeSCv z%Ns5G%HCO%>%6Ze2Isg$k7xFU5W=7r{Y8Hul)Xy=2Tq;$1O0*n2Z943aONj8 zF(0S3_Q8u>jV3`y_Pu-Wv(|pya|CvPwL0 zM%uM}wjsr}g5>|O!7{A#Hyeo`M5xFO6$x~mVIx3QqZ(0CRxp*730ilAq6=gQAFFBS z=o!&UDM0IYa)z)mPzy4*M4VF!SA5tCe>)WqWv&5H!h1e*lssAm1sG7`6s@)NO>U5Y z9*`wr;zMkaNh_`p*54ZXEq#_f%lCvhUpfQUMf;+pDdDVk991;q#t7{DjHG?hN{ib0 ziAE4&ls=Fna2iayLn|U`INLpaR%DLvDQ|=?lHd7q9b6a2;8fK7z-J)*lh$rHy1`YH zM$A#?37UBd9q(cIBb^pK&-V;yxF?+yc?AV%dO!n6(Es5`Spg_vg7N_r37R{Wu?%`% zL@83?32KG`x}#P{6G$?`&~Z%55e%R-Ny-o?S(?y42Wtd$VM>&_M&X-iQw!GV@mcx2 Qa#A^}W-bmYhvj{I1GaD;)Bpeg diff --git a/gfx/menu/luminos/icon_ipv6.tga b/gfx/menu/luminos/icon_ipv6.tga index a61947da785343cbb26660f75a4d2c07399d8f91..d3fdc03ee3e1cd4e6951e1b44beebd0d34b2111a 100644 GIT binary patch literal 1697 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 Qa#A^}W-bmYhvj{I1GaD;)Bpeg diff --git a/gfx/menu/xaw/icon_ipv6.tga b/gfx/menu/xaw/icon_ipv6.tga index a61947da785343cbb26660f75a4d2c07399d8f91..d3fdc03ee3e1cd4e6951e1b44beebd0d34b2111a 100644 GIT binary patch literal 1697 zcmbu9OGs5w6o&tMyy>x`fgo5HDaoWkNlns8G`fM%11ckmh7v)ef(Xkf&7e^aX(Cia zAr5*Cq(K8G4HFT>QP{}B%tU((Qfl|Db@n~gxPAEdW4->h*WUX`t5s>6#FyT-WdSsT zJ-u{gTkQa=uG8t7b=JE3=z=NVgJxTKw06cZ5C{>p2b94MunI`u!97s&NZwhH=jv9t zibbd*U{JFgzeQ7bl}>BHHt0b-s=&oOwFOqYfb;>>S%Ks%36lm8G!u<$Jk&2FBko{Mr+~GO zkY&3q>XmChA-xEKCZZ;R!jd$e~8$N#>x*3Xu9u$&A_v zF{2X@nB#UQTDA)jiB5W`QLJjgPurbq3abB$#Oq~;z7Yh?a!KnuB{HZE{Gy|$W(8lq>8Zw>~Ut{?d|k{f-`t$ z6`f7!T7k6|6VI9CBN)~0n0!H7Jnkc_LkXzCEd5`1$!l}dgyyP$Z~*^aYoe<4~l zF@B|jKXe&LlOEs}GY>GJA}*DeU!x1GvSWUS#gdv>+uv*wNGpGw?dMkn!@l9usHvZS z@93Z5^pp#}6lE)nX>|Ah`5Igc;53-^yHUoZ8w}!fmsIVjIzc0-Fb^>Ew5u7*!2kGn ntP)o2PSEHnK47N*>CE5Skwcy3qaBAk4j$NkY;VWDa;ts=mDQI}6vjX2O_u$&MXLx(x0NetVeo8GAVh*`1PLzMYoHsWO;-Ah{#c2dz&1iI z16NrsawpL)OtHn&g@_9aBgH3i`X!JkN< z8LfOsQw)f>ctuDcBs?>5ge2f)J=B;|JuOpsHXLO&y+f>Sm@HVtmHC&}!2A6qXCo+NxbIOBrqG`Lzk zNrG7)#$~~CnoNWDnt5%v;APFF!F#>)4-Z}|UG|2Sli>1wuVtC#`~KD~ew12l+Q|+u zlAOMsx}AP4aQexH-r`PrTOPWp@RAWe#d*5eMYqaDB-0BMWwb?i$wl+H#iha(+X(+& zGoFJTF5E(R$v;O-}8NIW~p+b8pN4Kb`lSgdn}G<_mpG*cjH_ct_gz0La3Z+)|h8PkxyuoX2cWR{5H za}~)Voq{^(glPy~4L%liJ7%`p1|KHN{e#$VU%cfT7QsuOC2t*c!nDGDI-AKBz@Il} zGv-;osPKFjK?Z?UlSQ3nbSWuwJV;#p2uySqmb^aADsZa*Pvx5&BdCE{FOODleklx^ zFw!TwtVa~r=D!X0vrq}$@JojnZid%DY1RT*{re4hn1Eie9I;&!rj#3h%g0=i3Bp8} t2ow8xkQVHSHf-cK= 0)), iconSize, '1 1 1', 1); - - iconPos_x += iconSize_x; - draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_aeslevel", ftos(q)), iconSize, '1 1 1', 1); - - iconPos_x += iconSize_x; - if(me.seenIPv4 && me.seenIPv6) + else if(me.seenIPv4 && me.seenIPv6) { if(isv6) draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_ipv6"), iconSize, '1 1 1', 1); else if(isv4) draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_ipv4"), iconSize, '1 1 1', 1); + iconPos_x += iconSize_x; } + + draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_aeslevel", ftos(q)), iconSize, '1 1 1', 1); + iconPos_x += iconSize_x; + + draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_pure", ftos(strstrofs(s, ":P0:", 0) >= 0)), iconSize, '1 1 1', 1); + iconPos_x += iconSize_x; } s = ftos(p); -- 2.39.2