From 486b09f40fae4e7f2d750c82943514c74c7030e7 Mon Sep 17 00:00:00 2001 From: quaK Date: Wed, 17 Jul 2024 01:41:15 +0300 Subject: [PATCH] rename global to ui and ignore it for dedi --- .../{iw7mod_global_mp.ff => iw7mod_ui_mp.ff} | Bin 57024308 -> 57024304 bytes src/client/component/fastfiles.cpp | 5 ++++ src/client/component/updater.cpp | 23 ++++++++++++++++++ 3 files changed, 28 insertions(+) rename data/cdata/zone/{iw7mod_global_mp.ff => iw7mod_ui_mp.ff} (99%) diff --git a/data/cdata/zone/iw7mod_global_mp.ff b/data/cdata/zone/iw7mod_ui_mp.ff similarity index 99% rename from data/cdata/zone/iw7mod_global_mp.ff rename to data/cdata/zone/iw7mod_ui_mp.ff index d791b09096ca4d2bc478c0d5d6235d189f3bb741..de30964973a33083217fe55e5c90ba7288a44971 100644 GIT binary patch delta 3285 zcmWO5}xmV4u}_WSVs3D1_@ zvqLswTJk6n#RtZS3`-mtS~eg&vQO)P(8zNk0oz7d4v+)oAUTR0RgNY{mt)8=JSP&uERUoIdQlncp)GICitOfDyv zmn+B>t|nKPYsfX_T5@f!{rh3NcjhOl>DPSS{@@y9xIQN$IB7&1bL!7NuDfEk*CVjl7EqZl^4rP~vzsO(ZZxIfd>;MEJ2vHCf z(GVRm5EH?Oh1iILxQK`NNPvV$gv3aKq)3M3NP(0HK`Nw18l*)!q(=s1L?&cL7Gy;> zWJeCP?=b{JF$}{o0weJQM&U<{#ux}=F%IJqfeDz1Ntlc&n2KqL z#B|KSOw7Vh_!+Y?2XiqG^RWO6u?WB5S1iU7EX6V`#|o^(Dy+sDti?L4#|CV~CTzxU z*n;2j2mZuXY{Pc!z)tMKZtTHc?8AN>z(E|sVI09x9K&&(z)76KX`I1XoWprsz(rib zWn95kT*GzTz)jr3ZQQ|M_#1ce5B|kH+{Xhv#3MY$6Fi0S4A1cbFYyYm@gLscE#Bch zKHwuh;WNJAE4~FpIFSAbL=d7NDxx7eVjw1h5eu;q2XPS(@sR)tkqC*A1WAz$$&msn z5rR}mjWkG$bV!d3$cRkHj4a5CY{-rr$cbFYjXcPUP~<~?6hJ`~LSYm^Q4~XQlt4+8 zLTQviS%je+%A*1*q7o{j3aX+Ss-p&Kq84hS4(g&F>Z1V~q7fRS37VoAnxh3;q7_=B z4cej|+M@%)(Gi`{8C}p7-OwF9&=bAT8-36h{m>r+Fc5<<7~f+EhGH0oV+2Ox2aLjx z7>zLy#$p`CBLWjJ5tA?(Q!o|N5Q*uSfti?vpYStgV-DtG9_C{K7Ge>8!LL}1C0L4O zSdJA~iB(vQHCT&vSdR_Zh)vjx->?P0;}86at=NX`*nyqch27YLz1WBSIDmsVgu^(3 zqd11+IDwNmh0{2Lvp9$IxPXhegv+>stGI^ixPhCvh10>jBpVB5r`l}K~zLTbi_bR1S1w= zBM#ys9^xYb5+V^2BMFis8ImIfQX&MYkQ!-_7U_^48ITc~kQrH!71@v-Igk^%kQ;fB z7oo_9{3w8eD1^c&f}$vf;wXWVD237}gR%%iIh02QR753IMio>=HB?6p)I=@RMjg~e zJ=8}7G(;mbMiVqeGc-pFv_vbkMjNz6JG4iKpj{3Rs_m%vL%;iO+n%sz;Xyk>gEMp) URHR3*4y^}tSrnYMV^EI&0h%eRod5s; delta 3289 zcmWO5Aq8v$%EJu-}%F*QL zatt}997~QZ$C2a8@#Oe&0y&|aNKPy#k(0{FN3o%SGg(axuBMTtW_(OUk9>(sCKO ztXxhmFISK&%9Z5GauvC%TurVn*N|(U4InxvAVtZZ5Zw zTgt8E)^Z!Ut=vv-FL#hT%D>B<-u9w(2NC&&}!N%CYlRGuPFm8Z$m*WpdMtPIGS>7UVmAA>; zXSbicum7mGaTh(~ygCwPiyc#ao%iC1_H;|>17zj%vx_z&;#0Uz-RpYa7>@eSYc z13&RAAjDzlk1z;CScF4(L_kDDLS#fiR768`#6V2MLTtoAT*O0sBtSwWLSiIAQY1ri zq(DlfLTaQzTBJjIWI#q_LS|$^R%AnVq7VwB2#TT@ilYRA zQ4*z48f8!x{x}qDpqX&AT7kZ-)`r;4tLw^jwKn%iQ48c$g!*GniNC=}a z8eUg8yA!+3*# z@Gsut9sa|6e85M1!e@NJSA4^F{J>BA3KQZ$`XdYi5fOR7Mq4MKx4M4b(&})J7fD zMLpC<12jY(data.size()), syncMode); } } diff --git a/src/client/component/updater.cpp b/src/client/component/updater.cpp index 272d83cd..c33de01f 100644 --- a/src/client/component/updater.cpp +++ b/src/client/component/updater.cpp @@ -29,6 +29,24 @@ namespace updater { namespace { + std::vector dedi_ignore = + { + "zone/iw7mod_ui_mp.ff", + }; + + bool is_dedi_ignore_file(const std::string& name) + { + for (auto& ignore_file : dedi_ignore) + { + if (name == CLIENT_DATA_FOLDER + "/"s + ignore_file) + { + return true; + } + } + + return false; + } + constexpr auto override_cache = true; struct file_data @@ -251,6 +269,11 @@ namespace updater const auto name = file[0].GetString(); const auto sha = file[2].GetString(); + if (is_dedi_ignore_file(name)) + { + continue; + } + console::info("[Updater] Add file \"%s\"\n", name); parsed_list.emplace_back(name, sha);