From 562e080d64a903e222226b7ffe9d6aaf8719c191 Mon Sep 17 00:00:00 2001
From: aa6 <justsunshineandbluesky@gmail.com>
Date: Tue, 22 Feb 2022 22:07:49 +0300
Subject: [PATCH] Fix: minetest.settings:get() doesn't return actual value when
 unset.

---
 VERSION          |   2 +-
 config.lua       |   1 +
 init.config.lua  |  25 +++++++++++++------------
 init.log.lua     |   3 +++
 init.lua         |   1 +
 util/version.png | Bin 1682 -> 1494 bytes
 6 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 init.log.lua

diff --git a/VERSION b/VERSION
index 13ca94b..12edb29 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.11.6
\ No newline at end of file
+0.11.7
\ No newline at end of file
diff --git a/config.lua b/config.lua
index 27cff90..a4146e5 100755
--- a/config.lua
+++ b/config.lua
@@ -3,6 +3,7 @@
 -- Common config values.
 minetest_wadsprint.HIDE_HUD_BARS                               = false
 minetest_wadsprint.STAMINA_MAX_VALUE                           = 100
+minetest_wadsprint.ENABLE_INGAME_SETTINGS                      = true
 minetest_wadsprint.DYSPNEA_THRESHOLD_VALUE                     = 3
 minetest_wadsprint.SAVE_PLAYERS_STATS_TO_FILE                  = true
 minetest_wadsprint.PLAYERS_STATS_FILE_LIMIT_RECORDS            = 1000
diff --git a/init.config.lua b/init.config.lua
index 513928b..e4ec6d7 100644
--- a/init.config.lua
+++ b/init.config.lua
@@ -4,19 +4,20 @@ 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)
-  if type == "int" then
-    if minetest.settings:get("minetest_wadsprint."..key) ~= nil then
-      minetest_wadsprint[key] = tonumber(minetest.settings:get("minetest_wadsprint."..key))
+    if type == "int" then
+        if minetest.settings:get("minetest_wadsprint."..key) ~= nil then
+            minetest_wadsprint[key] = tonumber(minetest.settings:get("minetest_wadsprint."..key))
+        end
+    elseif type == "bool" then
+        if minetest.settings:get_bool("minetest_wadsprint."..key) ~= nil then
+            minetest_wadsprint[key] = minetest.settings:get_bool("minetest_wadsprint."..key)
+        end
     end
-  elseif type == "bool" then
-    if minetest.settings:get_bool("minetest_wadsprint."..key) ~= nil then
-      minetest_wadsprint[key] = minetest.settings:get_bool("minetest_wadsprint."..key)
-    end
-  end
+    minetest_wadsprint.log(minetest.settings:get("minetest_wadsprint."..key))
 end
 minetest_wadsprint.load_minetest_settings_key("ENABLE_INGAME_SETTINGS","bool")
 if minetest_wadsprint.ENABLE_INGAME_SETTINGS == true then
-  print("In-game minetest settings are enabled. Loading them.")
+  minetest_wadsprint.log("In-game minetest settings are enabled. Loading them.")
   minetest_wadsprint.load_minetest_settings_key("HIDE_HUD_BARS","bool")
   minetest_wadsprint.load_minetest_settings_key("STAMINA_MAX_VALUE","int")
   minetest_wadsprint.load_minetest_settings_key("DYSPNEA_THRESHOLD_VALUE","int")
@@ -29,16 +30,16 @@ if minetest_wadsprint.ENABLE_INGAME_SETTINGS == true then
   minetest_wadsprint.load_minetest_settings_key("SPRINT_STAMINA_DECREASE_PER_SECOND_PERCENTS","int")
   minetest_wadsprint.load_minetest_settings_key("SPRINT_STAMINA_INCREASE_PER_SECOND_PERCENTS","int")
 else
-  print("In-game minetest settings are disabled. Ignoring them.")
+  minetest_wadsprint.log("In-game minetest settings are disabled. Ignoring them.")
 end
 
 -- Processing world-specific config. World-specific values are preferrable 
 -- over both global config and in-game settings.
 if file_exists(minetest_wadsprint.worldconfig) then 
-  print("Loading minetest_wadsprint world-specific config: "..minetest_wadsprint.worldconfig)
+  minetest_wadsprint.log("Loading minetest_wadsprint world-specific config: "..minetest_wadsprint.worldconfig)
   dofile(minetest_wadsprint.worldconfig)
 else
-  print("Creating minetest_wadsprint world-specific config: "..minetest_wadsprint.worldconfig)
+  minetest_wadsprint.log("Creating minetest_wadsprint world-specific config: "..minetest_wadsprint.worldconfig)
   local new_world_config_contents = 
     "-- World-specific config. Values are taken from `mods/minetest_wadsprint/config.lua`:\n"..
     "-- Please uncomment lines of your need and set the desired value.\n"
diff --git a/init.log.lua b/init.log.lua
new file mode 100644
index 0000000..40f66db
--- /dev/null
+++ b/init.log.lua
@@ -0,0 +1,3 @@
+function minetest_wadsprint.log(message)
+  print("minetest_wadsprint: "..dump(message))
+end
\ No newline at end of file
diff --git a/init.lua b/init.lua
index 835ba40..c409189 100755
--- a/init.lua
+++ b/init.lua
@@ -29,6 +29,7 @@ minetest_wadsprint =
     worldconfig = minetest.get_worldpath().."/mod_minetest_wadsprint_config.lua",
 }
 dofile(minetest.get_modpath(minetest.get_current_modname()).."/init.api.lua")
+dofile(minetest.get_modpath(minetest.get_current_modname()).."/init.log.lua")
 dofile(minetest.get_modpath(minetest.get_current_modname()).."/init.core.lua")
 dofile(minetest.get_modpath(minetest.get_current_modname()).."/init.legacy.lua")
 dofile(minetest.get_modpath(minetest.get_current_modname()).."/init.config.lua")
diff --git a/util/version.png b/util/version.png
index fdddeefb39e01bec6897fe82fab0e4609c78c7a8..8574e8cc8f275b4aad9babc4fd16865921aff872 100644
GIT binary patch
delta 1325
zcmV+|1=9MG4b}^gi+>gq2QdSLg2(^>1hGj(K~z}7?U;K^m1P{qKj(nTMMM!0(KHpO
z4K;~oq-o|Qv>B+3ux6Vntx`v=oYU0JYV(rh4Z&+OndD`8$xCJ7U4ckZQ=}{=D#Fw=
z6fel-g>Qeb#<_7*H(L7L&L8Lbecs>u`~KeNywCF-lO*vN$ba0_1w1kOh~?^R(6R$|
z9fKoV!MF|m5@Bp-=s2)($+OPD<`3Yb-4NK;Ia8PbOTr;02|}0Fov$PbzOcZ#%V3`3
z1aJZ7gXemf5e0qrTE%3iydR}8x25LoB(Dg`+fQ=Ilm-uz&URL#G_$Ydn<iy1uASNR
zyX3K7`tIHO^M4haq?arbNaWjnawXHw>R6k#(!n6xYi*ur`4U(V1v_7dacy9-8JdN{
zhQqLW7tBe5<f-7bqK>u)!M(+BcpIcdfN3c3gB^1c%635Z$B@tyN+ZG4fLEf&0f;{a
zMccuYZe2K-10l}`X03#N%b-`0-Nn|f(|SvODbjOOq<<^XHRCtCO0TYw+}2A!xz*nB
zf=ubdm!&}!lJ~FG-Sz)N%05)Xl$?>~`AXq&Qu_hbjBA**t$X8Ui@l6YX?l{>DNagH
zc8uG+j8aSCMjVU+I&Q5QZ=DNKE1>ipIIywyj^9myGnr5v0bMGfWi;@-EmKhhXZu1y
zDYWkd{(s+sUabFV)~D2y@XZ`}e>8-hc8uFh-K-Qa=R?RSN3eGf@SF@egQ2WHv`BMg
zy7hqFv7m`?KM|r6Av@TXX%z|UT%ghqOt~<l0utRH&g6~hFs~hS9}klffbI1d&A$j9
zt0ABr(BBsHy$r1vL%}$>p93wN+|WD=TK=1OAb+_221*C=t)OD?u=?8kCXoDaMmKuF
zskyK&4E%p_&e%-dyPtqtFK|EP2)f5Wi%7Uv0!Ehx+&v#SPyH)(CSZDSlNUo_bpZ6=
z10(%w=WNO_-T?DvFz<5$t^-pH7@1Ht=fMkm)Y^OvE=_=m{@|6;K%;K2K*d6+7~u$(
zAAbeoFK}B3E?fCe=xPR}9EILnV93{Xvo=P3e}<9-xO2b}yfYE*g@aEqG#}g47OS<t
z4E|gOk>21N-w2~UGN3#Faub|%?=`p;22Za7&wVtx$``@zY2eu%hUL`H+ZY`b4z6qA
z=q;!mWD6dT1LFdO6;%ITn_8FhApI!_et#35S<pzMgI7YxeAp8V2aTHXthTUe19bZo
zhQD1ietjk^w7{1ZxL){Zjg%dSHT&T+H#ql|WBl|aD4Y#1WI(H;`t#YWqk$Hf)&bs&
zh1hb4@&?yL`2GkK-h%kq5M(t?uKB`(AwVA(nGXKBR>|_HUN%AjPvA-|6=VRZpntx0
zM%TltwQ#Bog3d!P>);7Ez89+ILP%A^8s~6K8?zl40n5`NxePQCy2irt7#N=dbgN;#
zuENlrV4e!C3T*SZWI?}+(DnqhJX?DKJ*U8kW)NVvJ8}(%0ndV86?CwBCzQv7`+OL^
z2txb-O9PxbKMzSaE2JDBDSN48kxrx(CtQSNjFXHBlE&D@E=ZLfC1aALw`$*vSDurM
zK&dL#E|4Y}e@ljsRAs+O-y#{&lJU8uI*x$WGD%PVGx}fYu`&7&inD=OnT8i_lMDtN
z6*4kZGBP?aH##&qD=;%UFfe6pl7Evu1{^suGE_1$IxsgnG&w6UGdeIZ6fi2o0000C
jbVXQnY++($YydDWF)=PTEFe`c00000NkvXXu0mjfifMDx

delta 1515
zcmV<H1r++$3z7|xi+=?V5;PObGByAJ1#L-0K~z}7?U;FR3}zU{f4f<7NQg)f;)pOz
z$)H+wRA`+wCZrWq<36V7P&K2JDnqGO)wr)}9cfglYIW4DLXeWWQW{Lq2t$GhvB|D|
z`p4E}k1T82VWvEP?f1UVdpzH_@3-HqL6Ue1V0_XIJQMmjgn#C2gcW0;e>F%b2Xogz
zR`R1KPdf%<TR?WMXU^q$Fg62@y!&Xm3u9sXY#6-~dKh7h1@<R_EyP2BTyTDi6n9H1
zT}cXxmCA)lKB-chcG8I&dL)c*B!#9(>9aj^l8#FOJEiqQyw7`UzBGQ4RKAZC@Um2X
zqGT+Rsv>=zA%EG<yT>>QEu1aAeL*s`mfox<C3lk!c9MpDCK(H)ZnLCYBOcO4lyrNO
z^mAXS`XnjLUrOKY!Z|FNCrC$fr4~h!F;d!4(>sy23(|~!k||f}5H4*QCZ#o$=Jb(5
zFH6<VO26-Yh|rX1DJ)TXeuVT_e6jsTEvds&$?q%a7k@v`O=PD^qgqQb7OC7J38adr
zrSv_;oPuN0^iZkeNGZIfonvYyZK&g&(9>oqa<KH=X(?m8gQK?e(RcQIAGdOkbDGf|
zX1F#Ix&RUDitWMY;EnlU9ss-6c%GZv^Wa!2<i$dy1p?!N7o0hk>u{nGWSb$pI#m1y
z)ZF{o+<zMZnP!OJ1a+o6IL^Sp#;{}`w9EyWo#RYSmq#KPv!HPo_X5#%q0DeN)dmV%
zfNzRBC#o*|G#E4x?k<4%1(06fnNzkaEcbzXVPH51<1Dbi-%FKdNR0v0RA|22ZnDNf
zkr8}<gz6R;8U>`ghdK$(%7lO=P`MJ&!kHL)5r2YbLv}B?dkTC@=)*Vx0`Dho1*YFX
z2Y@UGQXT|2EKA=2R(YwjHC$)|Wk*3!b67nSHeZ0;DNwl(Iv;@86bKwsLT`?X+hf45
z0r>B6C;ImU->z_{0IZQ-bd?4C!NY&4QvrjQLc<{cC~ys?ehI_-!l7o6wHY=|g#j~Q
zY=2wGuksL~)*fJ73&yP_5SN3YCs<R#_Mvx;{nxP01WN*3KLBYH;FB*PITH3o!bYIs
z8CbRglA_&XoxZw$uRv}zST4I0i;}^*4T9!^PYodM@e4Jkg3o#T=i$LHd<q!;neTRh
z`9+Ag!g?e0PJlp%i__^uL$^V}JjmbWUVkKiAl&H)A$d^x^~Wy~z;`E<*$Tc{(C+<W
zk@wLg5UNgvOn=BN?XpRZi@FD)s4|?J=U(JeXSmr6YA&`HdlCp}4^>-%VLSLtaQB<8
zfawG%5!mqnp)no7v<#AO!o3)0;{K6f&46av_IZ60F!Y0$8bZ-AIMm18|7QeT9)AZl
z20%#P2MBGm2pZ3T&Gliowb-6k0g_fi)CbVsp}^JgFf#`}&4H^W%=N!P;eJ@U6Q=mV
z$<K@J?Teu1Em+tQk}rYny4`*;0cI_P{8kV<8G@#{By@c$t*auHKPuH|BE45u8oOGm
zdr}J6CoQZk>1;9g_$(<nS_*zkI)7fvIZwe5>D8f9NO>te!t;}E^kn<9ZG9tWd)^?a
zvCZyVGtj}&Q(DkeDl<n4?=SV<DGlu_HTYIC#z@_JNjat5>zG`3GVXhz6U;pTs|rD{
zL9M|sw<jbd0#U`>pi9v92Qa<^WwV|0_@qJ8OsH@e0#A58xq2g@Qz@wIa(}Uy>O;$h
z5N3m_j(5UZ7_=P97-8vR*tQF-(;y-WCWgbXMNlEBghC~5bDng=BAp76(&tDyl9X5i
zFIKYllC1qD#ku%0q<ayPb&#aqo=^1NNy%D8vh8qjq)67Yk~KuKttuh#SLwz|=~Q>=
zWT<qdwPXwQT*n|i`_Jfqg$$=g=--Iu0vWFDen*o~1soMHHB>P;Ix#ppH8LwOGdeIZ
z^uB2slYs>sIWRR;F*rIgI65^lD=;%UFffJV(WL+Y01R|RSafV*Vr6UqFfK7ME;d^y
RWw`(V002ovPDHLkV1l(2!<GO5