From c7c66e46a7c7318b1fa4b701b86c236054b84621 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 12 Apr 2023 08:37:36 +0100 Subject: [PATCH] Revert "Arrange quick save icons horizontally" This reverts commit 20f8fff3feddfe83eabc70e59ebbe0053b167e81. Also make the icons white --- .../jni/OpenJK/code/cgame/cg_weapons.cpp | 2 +- .../jni/OpenJK/codeJK2/cgame/cg_weapons.cpp | 2 +- z_vr_assets_base/gfx/icon_load.tga | Bin 3421 -> 3421 bytes z_vr_assets_base/gfx/icon_save.tga | Bin 6160 -> 6160 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp index f234c58..c07ef1b 100644 --- a/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp +++ b/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp @@ -3227,7 +3227,7 @@ void CG_DrawItemSelector( void ) VectorClear(angles); angles[YAW] = wheelAngles[YAW]; angles[PITCH] = wheelAngles[PITCH]; - angles[ROLL] = (cg.itemSelectorType == ST_QUICK_SAVE ? 270.0f : 0.0f) + + angles[ROLL] = (float)(360 / (count - ((cg.itemSelectorType == ST_WEAPON && !vr->in_vehicle) ? 1 : 0))) * index; vec3_t forward, up; AngleVectors(angles, forward, NULL, up); diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp index aa82a6f..e8947ed 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp @@ -3079,7 +3079,7 @@ void CG_DrawItemSelector( void ) VectorClear(angles); angles[YAW] = wheelAngles[YAW]; angles[PITCH] = wheelAngles[PITCH]; - angles[ROLL] = (cg.itemSelectorType == ST_QUICK_SAVE ? 270.0f : 0.0f) + + angles[ROLL] = (float)(360 / (count - ((cg.itemSelectorType == ST_WEAPON && !vr->in_vehicle) ? 1 : 0))) * index; vec3_t forward, up; AngleVectors(angles, forward, NULL, up); diff --git a/z_vr_assets_base/gfx/icon_load.tga b/z_vr_assets_base/gfx/icon_load.tga index 0fced7d45fe3f86f5023cd5cc85a4fe6a7259d14..12a2c2e459343dd84d0c8c29dc22ba7aae67e41e 100644 GIT binary patch literal 3421 zcmaLa3#`s%9KiAad(QEm;~X5PD5j$v=E~JfeD%af7Dny*V-{+*qzEv#=N) zP%8#CrZxjkas^CiIx}c3O}&v9gD$1^9Cl+P`l5Db&{morM?nm#N9|#lucF7)^^%9D|&+580dW*QM4ogHF-(DXxz}X3wY2 z`%b`QbPPdbxvF#`9!Uc$&}BJAILeMT3_c2b(5*ViB|8CUeh~dp5CcudPdJ48QOALj zFq(lT_cQ#0Cvim#yn|Xf4&xa#%M3JV8SHloTF1bfsl9XlmuY;r%?w;alg$R2(atfj z6*W(Zb1|DGnSl#waw1M>GkV5ApWY{6p!4dR8TbZGF5MB$-GebOpISd0fax1l9q8#R z!>#xkJ{*pb6N3GZ1>KpaLOFF}@xxJ@GZn@Mz@5cr%iV_V6h&|5K40 z*x4_!t$KStCA8Yey`{F}T{Qe+`_!d(aN%?g%zy#HVP4>=)qNc0-S-p`R(~M zgRWu$%=@S%6r&ww6vp6HILcwH4SiiWP5-?KWp&cSte4*h2i8E+hN{zkXE>qTySpZ2&jPfSS@V#3wo+2c| zGvvq2q$g7(?r1iy!YmwxXJZU(%b!J2#{_yBTyOPXz~=og%!hBTd|ySm_UL`hFcRP4 zIOgIS%8?=Ym01ZXu>nfxUPcU6Gzbk@DM09K{!yhS3Y0#7gKv0KVTCEqJA=HD@~7}AO;mudjKYEJ4T~nGU!K| zrrI2XJRH67G4`SyjgmpfXmYv5G00?;!u9-xMJNeDlenr*Q>;PL7+^~g?8f|VK=axF zGq(jDkcmNV)pY!U&tYCO4v-3?81yyzp)dwHwXyJI?!W*PC4+X+G!ji>kcanPY=$Wx zgJ#K~bGd01gR;5F%-OIHGjT;S=qOD~P#S}rv=7;9@Z06qlR+nG`UKa+AhYLF=Y7Xv zGP;DIiCk4X5s##SZgBUN6yYd4+9>!a>_)HJAeZa}ocRF^MnMcT89(D7?m+_wN`=u3 zG`XMRS3HKxV&JXRDsc!;qD3;$pcSy+8E6*+Z=m+p*>7g?*&!LYmL{7GG^5>OU|VXQ z66azzdnN-H)8s^)P!;;dK%d@6VW9IGm<)WCCYSDr=I*{2m``mG_QUiIs}1z@mE$J- z0v`^?$O*xI+YKHu-+Ru>wwlCdxR?fC5YES)o`S|m$FtCZ+GZHrssbC`Qd5c>K-z`|#VPXj~`Wr}a%Z{(HCzHNO&!x3>!TSo)sq zTqoWfm@-tknO`1-UCfMdG{ zlTZ@l^QiU1NATM@b>cI$cEL&rMD-&p9$d92z!~`Cr{~iQx{5_G z@8gzHjCYiAn1GkyD2K2v^mXnuo!^(I(*A$KNmCPE-T!c5@2l}}h&3k6!&=CetL_Y+ zyh{9lJ#SO&Hq*bsvuLJvVgc?(ak4izF=WD!&r!- zITVfD6ervcv*7XAj;{aLjc+XTH6N?(W{usf#U|{A>+_Ge(hGF+0_|byrl$x)umLCL zQiLtu$Hiilq2`Z~kS1!W@)?%yqWZv8_-6VJ&S9kkukr+VWITgY;d{4WGDS#)XUKgs zGnwfW;rwUwc{$#|5qLHxz_xrF8<;>(gX^vR3)sB>jfL>dmG7%4*E8aMEie|};uz-R zO5`}Tkcj1c?uD821S~XuzU!L@A0D3-*SH4#k!yCsb3K?($K7vUs$I2PScPG@2{Cl%=|) diff --git a/z_vr_assets_base/gfx/icon_save.tga b/z_vr_assets_base/gfx/icon_save.tga index 9b53b2aa7bb0610c02e460a0d23858477402c68b..442b6ffafac7c780843c10b5027bdee36782f0f3 100644 GIT binary patch literal 6160 zcmeI0TZmOv7{~WHo-;Gflu>3NJ&Z$XsX1ddkQK#P&gfVaSeisVl%_s}6$#xh-gTN$ zDm4qDB*V}QO6W=m5n@#Opre=>gqCSq=8f@qnSQ@@F3vDcI_LNjx#0Jmz1QXY{(G%& zuf6w)qS7c^YNDE`Psy6r*4F5BW{wRJCbkL_4@aSHwhal)r7#>Gg_+Q>95c_BhD^;A ze(ljSjG4tz7FN3MV|&@1@1IZ9$; za67DqgRm2}&cJN8wHbbclW-h96)af2!1G!D|syq;yE8N&h)Bxqgduc8!VQ)7!g?CA(c>OoJ|m4gv1M(lQKRb5@8E&r-+~y6%GSU=Vaoh$9@S2R#)aq@3Y3FcdC;t_g93 zBlS=YXAoktnIorLnwZI!&N#btOb=_@rH2EeFiO8M&!7T2S&#%x9m3CY+*w8pef4ra z$k{B=`RS@SpI!g=n{hnb#WCYHS%_*nQ%D^gza)Pw@Mp)MsKWiE&FT zgKUpKJuW<;uS4I$A@~#;eVLf9lt%ar4#GO9FFe>)xOoA#z)?71u#~}0KnrY!=b>NW z!E|fD8Spi1HP|+5eI>NUSG0c6E$?8n86BQEKDd0n=?hf`sx~>QGBvg&Ltn#p^_kPa znDjedILgPxN?rUn2F_8c$sSvRNq@!6%~yVIeY|sSfQc~8x0dkLqu*!YJ{Sn`5ImoG z%4Lu*t;66=*aQa*c07r3hxh~5f|+*>6z823xqw4(W3YYTr^PmRjLlxdc5om03B0Fz z7Z%KG7!5zd-|z~IfJzUliadgAVGOK>Bd`Yg7Z%uSc@PeR*K;qFxI2ZH%$WCg_&$np z;9YkSxUv?neQ;snbvXh2l5y{^ZNfxx%oQ*W9-D@Fq8Kv?Zi7-VhfOZaP8f1-Wz^+l zI3GX2eq|g{hT)b%Z&1c_VA%nuWc1-|qtz6%w9OZfQ|@(JZLwP?uRuYDpAU~i3e598 za1bmTz)+nFxsq1z70WpgGBxd~)hFa5up)DAhzjT+B-~4;w{v$R_<*pSLovVO?q*n^ zUrLx!emjVnX{C3Q428E~AM6Eh<2Ik_`7Bd*b`*3I%m+)Sf@aVd(p^FBp^MD3J>CHC z!mZHe|CB-{IsIppp98Rs* z_=St{l|nuSUpRY0TQNI1SA?^&7!=_`EeC}p=3&|kd6gQ=Cg}SwLN1}b2wbp!a5eOY za<~voQl(@c4TgOPmVgW6`6_U6iW@L#8M<_+Gn4|is2b2^ayq6ciLu8daBh55j)GVd zrpS=R_AB$KyE9bO9g~0;!O{ZjVFxH>B{)lEFJs!vm`si7XAnOdoWw@mHz~vZpTkMe zsW)YVGMZ*$8V%l5;t_lU7W*Crum3$52BmgL2i9#2yxX0XpTVmefKQ%bjCYFktj z>e4A`#_WY<;OZuo63x;iFk&J&wO_*bwyf9X29tEX?LNfT!8@R`#C%LNTcdYZ=VG`V z2H7XP{$IyICG>_8H~wgzM$d_*n6M~GU!S5i?M?O{|9eJ{sU2H?cl}*=4jNZie@AU) F^beb-cu@cV literal 6160 zcmeI0duWwq9LL{x?rd`_qs&11!;R8Xb2AgNqL}5Tvna4MiTa~7^^dS3p?kSGZ);O3 zwF^X!3_~+0p(`Ooh*9YuI>pQ&v`o`7Z_Ih?^Lcj8aVK@nbNnarfzR(e?{oS6zVCB; z-}gjOag<7xQDszGw93oVnc1m!@d|QzUd5qomf3u`6h^?KP!A1DF>|eHNR~|H*A_iP zpPA%B$IJK~2g_kA9J2ROh}vo~t>%urh6!ay(q(O-odFJlJ(s~)=oNfh9VH-!+hHZ_ zhwZR=24M>y&qLhgF6r6xf zFciYbIGE`c<{t*b?1hmKDI`xHCQGcbg)L2aX&*6Hdeys8j5ZHCi0Q#)H&_5xuZKQh zx*n#%BydfbCW68KglgA7q=#y-#2Q|swm=*gsKBN)ku-A;~5O316pYMYgT=}BmV zEif2NT^C{xd+I??COxNw7_o~&rqXl=d<%oX)O8{Du%{mMWXe*A16c{f-~uppU5GvG zSqZ7h?nH=-%{6kmsflZ;XkT$QIaPzD8Oy^CQRt=L*eg;QoMA%psX8V6OgnWkVrZ+E z^Fg{YLFb37?ELEbzi-9~92ZBxr`o9Sob#|5l`OGlLT>xS^XP%3JD=e9L$S}qIDs*h zK&r(b=5r6|>(DoF06u|6Unc65(g>fzepmxFxd*!nH!r{@I1I-O)@HC{&tM6!9iBNpxO~0o3l#<$>f)$KmROSrZ4H06&zuJO zw7=tpTsAJ2>*BxBakf%T@#~npkej2;Mt*vJ+&MSEB&hYRC4BYh_gT0P20~s4o=u?i z3i73OIJ^lPV4uN`CNQ25zr$*9<9abof6dS4j^4ze@7>43diY^#EL?q@7B7AC!~`lNtsy7fGI|Rj>d$9VG>X^`j&Y z!na`u=-~r!tc$}Dkd>%jbWcs4=jzAM0-cJY-sG|#3eE5fxI5ni|CK74jcNZE>TJi! z1H%1v0F)8__B+vo+-m3pri``3bqr4O8{iuBk+=k^p>Pf+Q%uK!FAZ~Q*oklyJdaNv zgd@1}9zS<7zEsFZ;0tF@Fr~z7C$9)cWf3UCiCPK@$)AhK6!HoM-sJ}9+li1%s4oB~ ztRGwr{lW3L5L~3D)T6<$4}otxPK?(pz{x3Wz-0bK=m@oeM^q)~GEs*qNMLk685|oQ zm7^hU!l)=Jv|Wk0?v7AFcT7IK2;N#Ntc7i$l;z+kmAr(>lre<@m!CoWY;X`8b>E~6 z+kXbfL8orY24ytWV;T+KRAdgm27}x7FnIs(!f+_IL3?1`#^7#uRDJ^Q@~|FVf$jf9 z>nUngO(<($lCGHDumqglgi@lJn*1a#1c&wu_|6)~AzJ4mU27X3VryVAs4RaTCYq(u zyTf}iTn>X4W5VnIb!5t+HxzmBM{_l%{ANs;l!UKO|NKASBGWx%##W81xx41BI|q%g KuDPSCJo+0U%>?8C