From 4c25bf9273879549961df129054c13b155a8f390 Mon Sep 17 00:00:00 2001 From: aa6 Date: Sat, 25 May 2019 11:26:00 +0300 Subject: [PATCH] Fix: Move config loading code to init_config.lua. --- VERSION | 2 +- init.lua | 1 - init_config.lua | 3 +++ util/version.png | Bin 1758 -> 1484 bytes 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 899f24f..f514a2f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.0 \ No newline at end of file +0.9.1 \ No newline at end of file diff --git a/init.lua b/init.lua index f8c6cc8..004f787 100755 --- a/init.lua +++ b/init.lua @@ -28,7 +28,6 @@ minetest_wadsprint = savepath = minetest.get_worldpath().."/mod_minetest_wadsprint_saved_players_stats.dat", worldconfig = minetest.get_worldpath().."/mod_minetest_wadsprint_config.lua", } -dofile(minetest.get_modpath(minetest.get_current_modname()).."/config.lua") dofile(minetest.get_modpath(minetest.get_current_modname()).."/init_config.lua") dofile(minetest.get_modpath(minetest.get_current_modname()).."/init_hudbars.lua") ---------------------------------------------------------------------------------------------------- diff --git a/init_config.lua b/init_config.lua index a5230dc..8552598 100644 --- a/init_config.lua +++ b/init_config.lua @@ -1,3 +1,6 @@ +-- Loading global config. +dofile(minetest.get_modpath(minetest.get_current_modname()).."/config.lua") + -- Processing in-game settings. In-game settings are preferrable -- over global config.lua values. function minetest_wadsprint.load_minetest_settings_key(key,type) diff --git a/util/version.png b/util/version.png index d2deaadcbb1a11fcd279a081a6c105dff4cafeea..0cc46b7796b1b3f55eb9271e9c4a55230618784d 100644 GIT binary patch delta 1341 zcmV-D1;YB?4a^H6iBL{Q4GJ0x0000DNk~Le0000k0000N5Ci}K0FG5@nvo%Ee+U`? z2h0D8000E2Nkl6A-wwXU|41n#%k#ji%ca3rq`vi1 z-WsEKcBXXiaA_n`MSu4hfBRmRW~`L%OP9PRHG|JI_82bbF+Zr71W^ePl-;6Rr$KZM z)SQ8g0MEb4!Yyz$8zTF`gT6*DbOTI`fcy`jz~(;Vr{nNr9(3CbA;C8v5& z9)}Tazzv%NJ}L0SPH0@?e(3c~s4oF)G<15y=$S$xupIta2t|wCe`mZ>3OS{abqdy( zH;cs{z)O9=?^o#kf@@gMX<%6mWra|ejoS*C4L(V5Wfat<8NJ37xOB1U^|c=EGkmJR zzX*Ko;5)xrba()-*#zcU;Jd*!%+CZ}=72389M$fJ4o!st>5#btPQ$ zgLJG;-~75ffIH@af7b!<+VA>#ucKfZ42_AP@7&MnGa8m&1A7$2_JP;>!j2iR+zv}# z2h7cR<2wlMrVIW1z(4tp!(eaI4!2BSv-@$Lhw_d@JdnD-o%T{L&^M!y`_b6=}tcin^r~d-^t?Tx)Wl|5D6jCI`Es$PyN`sC` z{oCC#ex)t?qw`@; z8jQOLXTF7fK2Vnm>vCb+6u2wOm@_mA#^=LBiLM8G&k&dz0S~;`&WTHsilwT>QenDO zP%BjiL`%wRqc2Em43`?WNZROX*Ca~kXG!^qQu$=bxxej)Do2jgV3!=puAVbRY7CSd z#YWvE-TBXX2fQQoCsSn-?E6!3pOaYzAQ3S-GB!FeFe@-KIxsLpql5pGiUuGwF*-6f zIxsLRFf%$ZFf#r-LjV8(3v@+TbZlW_Wo!U2E;%kSxZs9-00000NkvXXu0mjf_D6O> delta 1617 zcmV-X2Cn(c3*HSOiBL{Q4GJ0x0000DNk~Le0000q0000N5Ci}K0KVCHyOAMle+L2u z{^rzS000HLNklT&LB__ zGGa9ribXoDBDB~7wMtvtQc(s6D8w)b>QJl>mrz=&z(@&JF$BY{#DoM03FPEF{)jW- zaFPT6>U6sP?AhBu#qr% zGPK`u=fc%*z}wSd_X)UI0bTmSLuX(_Da1c~=Q`!PVaHL}yBk6oFk~N0&W4V!G_$~4 zqWG9j*rD;SYATvKP~%qXxW0OFp?4HzRXTsXwmPNBFKD~5ns8Oq&gsgoe|r7VJJTth zq*JG8!Z)?`2u&^1xHx?vUQdi^dQF6(+A__(O9Ow@nQisJ1U+y_ADN_qxjH*jYnR3@ zqCP*Kpj(z{|J9oEz83uK_Gap8H19DD%+#F4y1$hk{6KTn;2iy0 zYpq^=8$*S^(DdhZ@OeGAf3^|7P^v>;)4MbD-CeN@DLSnktF-q?{bx=jx38zBPtkE{ zT0JJV&fm&4<9_XzrKguP;^o72RI#RfTlbv2jiIGGl?A%IBs%fA0}8sTK6W8*9@Su1 z%^M!g)t=D_S=x4>9y=Xd=k<9F`z`rlG`FU{fm@an%|%SPBLRrpe+vT&qQA9%tss61 zocIQWpKJajzO)j;#gM)!noC#(8C~GgFgSHj>|t;`wc$EoVKmow4y1wUJze zp)=hexgWGojTUJ?7E(^ZnM}CRzWGAh{2GD-q2wzNele1}mJB7cAoMbnuWVkUZXcXm z4vE*G!)K%Uw)-LVe=?jM4Ym1^T*TPE`g2HH07)IAMUt05{BXEh4&k}L?52z9UjUtE z!CMvZP7aLtA0A!`1ykYRdky!siOm}d1)%!7kdz56J2g?uUP$~4RNoDuCu0~2Jp#c$ zK(Hl{cS|b|LtqGm7J~`R7t>=a630WZMT`!mFNfj{ zaAivLCRMwke|9LO4TZS2#EjORVe!L|vkN}_I@E20ZZn{JGCX<-60btL5zVhp=mu?i zLCp-fJRzFD{4Uh>WGhkPQsFxxF{VyebV&*A0iG$KmFXa<4Ax9DCe`R%m&SUhb|I zL~>OHI=rQJ_((s@kFB$;L&Io(?Y(I3x4+Wh6#do)e|2<>vHisgXfYfLpM>!DZ!*0K z3eQ7}D=>Ik?CxCr2xk2i=5B@Zo{`*V1!C z?^m?sdUW@q4yT(l^{#2!wX-gorjKvcu1oYYKhTY9B6D{y(H2?S{UyE7sS$tsP3>@A zTMyNV*LB|Swa*h8KS%QxYW0!E-1_Z0sa?bCfAws3r2e+Ens!FJxyq(&INh^&z@*uZ~)$ zX=k;~4*mQ?`r<#d@|L4hc&08}p;;-qWql+UTB^S((UGN^enHd5=-~ajevw`e-Ju~> zSc|mciWWVkMcG9KEHd?etkFVGNd`bOI6MJ3L`l(tM(r{)I ze7#mq)DzwG_zo?9M*XwRMnFIPr|^FrpEyJR1&{6@I1tX#^pi&gAQ3P+FfuwYH7hVP zIxsMuifm?+cm*IdFgh?YIxsaWFf%$ZFznaV+5i9m3v@+TbZlW_Wo!U2E;%kR&*!%4 P00000NkvXXu0mjfSUC^B