From 08780e87372c4058caa440669fba6b9ddd804850 Mon Sep 17 00:00:00 2001
From: Louvenarde <louve@louve.systems>
Date: Sun, 15 Aug 2021 00:26:51 +0200
Subject: [PATCH] An iw4x_ui_mp zone that doesn't replace everything with
 preview_mp_rust, which sounds like an improvement

(cherry picked from commit 27ac0e9ef986112c6d60fe5a4989b4ef26dab015)
---
 .../iw4x_00/localizedstrings/iw4x_english.str |   2 +-
 iw4x/iw4x_00/ui_mp/pc_options_game.menu       |   2 +-
 zone/patch/iw4x_ui_mp.ff                      | Bin 1315 -> 1435 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/iw4x/iw4x_00/localizedstrings/iw4x_english.str b/iw4x/iw4x_00/localizedstrings/iw4x_english.str
index 83068c0..c427e56 100644
--- a/iw4x/iw4x_00/localizedstrings/iw4x_english.str
+++ b/iw4x/iw4x_00/localizedstrings/iw4x_english.str
@@ -539,7 +539,7 @@ REFERENCE			MENU_NEWCOLORS
 LANG_ENGLISH		"Use new color codes"
 
 REFERENCE			MENU_COLORBLIND_MODE
-LANG_ENGLISH		"Use colorblind-friendly team colors"
+LANG_ENGLISH		"Colorblind mode"
 
 REFERENCE			MENU_CHANGELOG
 LANG_ENGLISH		"Changelog"
diff --git a/iw4x/iw4x_00/ui_mp/pc_options_game.menu b/iw4x/iw4x_00/ui_mp/pc_options_game.menu
index 53e65c1..51139ba 100644
--- a/iw4x/iw4x_00/ui_mp/pc_options_game.menu
+++ b/iw4x/iw4x_00/ui_mp/pc_options_game.menu
@@ -76,11 +76,11 @@ menuDef
 	PC_OPTIONS_SECTION_TITLE(MENU_TITLE)
 
 	PC_OPTIONS_DVARYESNO(0, "@MENU_SHOW_BLOOD", "cg_blood", ;, when(0))
-	PC_OPTIONS_DVARYESNO(0, "@MENU_COLORBLIND_MODE", "r_colorBlindTeams", ;, when(0))
 	PC_OPTIONS_DVARYESNO_RAW(1, "@MENU_NEWCOLORS", "cg_newColors", ;, "@MPUI_DESC_NEWCOLORS", when(0), 1)
 
 	PC_OPTIONS_SEPERATOR(1)
 
 	PC_OPTIONS_DVARYESNO_RAW(2, "@MENU_AUTORECORD", "cl_autoRecord", ;, "@MPUI_DESC_AUTORECORD", when(0), 1)
 	PC_OPTIONS_EDITFIELD_RAW(3, "@MENU_DEMOS_KEEP", "cl_demosKeep", 3, "@MPUI_DESC_DEMOS_KEEP", 1)
+	PC_OPTIONS_DVARYESNO(4, "@MENU_COLORBLIND_MODE", "r_colorBlindTeams", ;, when(0))
 }
diff --git a/zone/patch/iw4x_ui_mp.ff b/zone/patch/iw4x_ui_mp.ff
index c2fb8aae655f50b91147dd1867c7a3b14ec5072d..1636f65c7ca058fdd16d17b5760b979303289176 100644
GIT binary patch
literal 1435
zcmV;M1!Ve3S7v5)F)%O`0RR91SdrHO=KL{5c-rlmO>Epm6oALxO<Af!P^2IZMXXSf
z0I4+1PaBXB{Yj6J3N6qB$enndT@$azn(^-Dg4hdEFGzcV8`4UM3lT@8a^T3VNL)A~
zMJOCOa-`+W*fa5N_OF?sC!|i~jNjVx{Q12%WBa|Y&J)${o+YLoEReB{!uAN-=_fsE
zKlh|Z?a$@CY$Z|x$;l?j6}j70k~|hMS`$7Gg4k;&UM=#~5f`?NJGU>A{H&6DIK#T%
zl*m0dakPen2kkKEcs}zQtvC&8>MY?X4Qrz`^xi6w2hM{d8sO>|Z3Zvf3|_GrylOLe
z&1Uc=o57cD2Cq*Y+@MbrGWV-HJb0V7gNS;8@M#hhwLDh5g`HIo0=E{XVl+u1>ZOhi
z=RO(M0U=MfXk25l3H!zTvV$0vY%7!U2o+n@--%dy>^qSvBIZxE=aliDXjrLW_30WW
z+kwMk;!`or5)+m9lm~H2V;gINjye;KFtM?RQ8Lyl1Iz0A$WWJhSTmu1Y69%}Vt~yS
zqf$i_?ApYr&tPq?vCbH~&d9+j*ka_3%t#>>cp_#UEB7ibDQ8LO)5yxloC)D=hdi*+
z5{Q(h!K^?N4YW;p)5bKgw4R7zz$9T@=QOSdHjC?aD~Oh-1k6N^oiK_TtR<}c6SsE8
zy_L*%8>}7hI+v5jBKDIo38FBb{J^{a-D$Or(ZOjdJV9eYJ<eDbDOZjcDZC|8FJf`s
z#<FsGY{GJV5;`Wp%;qJLGMGFT!KM^=B9WnQ2g1XhVB%^$#m}PEY=)UtljAMbDW_o+
z@PzUmn<r13`ZP|bJb1<%m4y)xN86IT>^Q`-Im9WIp?~;junm6HY_Yf{nlusFb>*kc
z-L*5ry7aOCOIxnx$d0;wy*Xgj!|y(2B-fq$ZxE8i_m@)mGsaWChaM(CJEV~Z>t^b+
z$P=M_fqA1533w`%9s=p><ofNa*JM)XGdU1`li_qW^J;ZhIw_C2GW`E2zhb0*gE>PM
z%x^N#ZgTcX;HM#rHz{0um+bBB$q1Kc>L}|l9@X;0ZQ-qWOJp;YF92*it-ku+Yt@aF
zjXQ5vZ#8Hw;MME!$|WaImAnftb`>(;hbVuic=s=5cwIu~dvYHpbJxlD!Qfpt-_Ot4
zFPyV~cur}*EN_v_!#U@A6>_CtA&Y(ZZYnwQGo2iC%j6)JT_w*Mxvb<<My@FNsays_
z?mHk8BfCm=j9gZ-YvhWOOCW>IT*(P?Pwq=jIIkzYT=ezoRA0-etQuc`sC*4kTJZHv
z=#~h{*CSUYC}aa&jBnE97M1!q80n0h@W!9XWB5?po)rA!kdpRKk5uOS*A&79X&;ae
z`g2mQTu?S8`Mt}C+5*E#)(@bUgReff*B@;In4<EapZq~U+0w$jg%@1%?EXowem|Zf
zOU2diXhKF)JcB@?k~$h-5eHz|0KA9;uwnpS!2wt`0OxT4)(pTJ4!|V?@HP&>Wdm>n
z2VmU*Y$5;*CjB(Y`v@e(#G&T+7=fdZeAE~L4u(!(YK$flhD?HLh87-!O!#SxPmwUP
zWUQw69ErjtbT!BqI3Ok|tU10!<H!@s8suwakYbd4i^P&AxHZQ2co;HCt}%YV!qAC!
z4e}Ebh)ULLh@TN5vV^}T`2~~2<i<74Z&);@@SsV4#~~RmUTB;@ad1=tL^J$_#n3)#
zkH3*v3WXSr@(&V<D(0AshJyleSP(Kv4IGfHsALiwI1q=0DU;y90Wrlbljp$U7%q^R
ztOpW~DYBXD2M&lS)R`m*F2|rzZXm&^f}u%@AVTP(qe+Wkv8ckONs1s*WW`UD6TzV<
p7En!I1P3KA!kWwo0!3cPHCd5ighCND?5ys3tq{No`4=(;p`yC6vP%E}

literal 1315
zcmV+;1>E{cS7v5)F)%O`0RR91`jFQF>rD}#c-rk*&2HO95FV0ps<=OH4W#IyK!qZQ
z)`!ONPvZ7cC-K!l+5~M51&B4Zl2}t*VwaM9tByJ95d`#5pnie$)(6O;k6;vjfxbY}
znH5RVw*KOE*C>z`sO6Bm^Uco84#}CdHPCJFDHQFu_hD*dc)Z58{I<W=e(7z0t^Mt+
zr{;l&lr!2OyL8&u6y1vitE)hA9{cUYuSbEt<KnUR?CD*|MtSadhxLE;;JKSPIfq2@
zZpeFnApBM*PI+CAQjX@ZJ&D8M8xLMOFE4OF^t&dLH%umPnoQm@nY?W>`JTz-`zDij
z=1y+0n*d9Hx#uT0SeHl4=PF<cFLQY#e+zqCK00naOx0vbN?uPq_M8`Ro(H--J795L
z#D&}6%3#lmQ5_u>s7zpSz=Fd_q?cX^v4})4SD$m{`>JKcLNw=dn5_qi!6aa6o+f58
z37F(@%3>33B9Ep}tuQgsN5N#OR?dXgor$had_+58L0UN2$7Kgw%twhu#E(pTG!Ph@
z>!LSBuM5f{8R}x<LKc*Q82Bm{JtOmKE~ykr7_i95#!@KdH$urxxNw!SlrJjKOa(QV
zY@4VCL+h0&22~QqP08XWHwmtd4v#kGILu5r4#OyFiH<U|Puw}2_ExgkGDMflrlied
z;QL9K@F<LDKk#1szO0WaJS0n%uUM>@FNGL+%I@VnMRru`M<Q;TXqLib8^iTg@R%XY
zVpdYAz|CXeY?^_u5^{YrL1cKyXGZHec2=EsI~-{>xm>7DB?}`i6DAK$o;+O^usEIb
z;F+#e5k@kctV{UZan66d>+7!<Zw@$K1?RoWXqfm>b0Ff5YO_Q^K4$OF?RO_)|Bu>6
zJrmi{%g+x7wL1Rpqvp8o(tjgDk_5qeia#hTpI*9f19U?c`4~6TKt#R@=>_JiR;2K$
z<h?>k*Wl692M;N!^9xPHYvfKk$>Tunh>Vo^Tm}Ds$`B)c4fhPJ7T3tp9!v2v57JP?
z`wX#<;Q08MJe)@6Ue*&bs%N*m%HQ<YVLzl70MSTmUwr>%ZEth$+1IrvEmr5U_6T3O
zXam*YJAARL!pac6{M+*CKO2eH2Ur=<Id0~@lbxf&`)+ogjX5ceIT?@fPAarSSiv#3
z2UXY|R^iqVzneUVKGWf}UxCw%b~U|J&=pPJDCnxD-^plH<cWhc6tt^pr=TmEb_=?y
zX%A`CnM-maJ)m=v6UPn6%4J(`&9yaoWv#IFkJ{F>amTiPjNLjw7LQz=prD4lgxqJz
z6Gr?bD(OAE?-ce--oS>r?xAEK2fW-q1E{VHA8HZqkbaOp9WD`Fy`yys+1kmY4p4C<
z>krt|<Od%f4=3vYw<z5VlD~@xm4{slm@~pIJ)AFu?bYY2pSbYB$yG<sKW@PKKR2}v
z;G<<&znIXmg{Tui7Qr@bf^FIa+p-C^Z4>OCO|bhm!FH^HolU^mLM<okY+;rXd=??|
zgrH4GN+4Rsqr{j^$WemQCSsA$v<O-xK<#2?3DfHUwQSWqA!`|u61Y|&^MtQWP@N#Q
z4LC|DTSqPOtX7eWgtbM~^9gQ?&^jS*6|Z|e>ntVQZNlmVy+y!rLf<0jr~qIQa9l93
z2wD^vEMlH7NZ5of3K$kai-N~BVA@}-E~wZB%nLA9adpAQCgP~TV-c}j5V8oH6_9Kp
ZW(B8mF^A5>-qw-d2~i+`e*uBrgj#%`g~<Q_