aboutsummaryrefslogtreecommitdiff
path: root/builtin/common
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2015-02-17 01:37:14 +0100
committerLoic Blot <loic.blot@unix-experience.fr>2015-02-18 16:17:03 +0100
commit82bfa2ee7b90f678b687fb42405ca775c517be13 (patch)
tree5f55ebb512aad9b995dda71f98195dd4473c3dfc /builtin/common
parent9ef2e5000f6df5a0c16e0343c6af59967150db42 (diff)
downloadminetest-82bfa2ee7b90f678b687fb42405ca775c517be13.tar.gz
minetest-82bfa2ee7b90f678b687fb42405ca775c517be13.tar.bz2
minetest-82bfa2ee7b90f678b687fb42405ca775c517be13.zip
Server: announce MIN/MAX protocol version supported to serverlist. Client: check serverlist
Client now informs about incompatible servers from the list, this permits to prevent the protocol movements. Server announces its supported protocol versions to master server
Diffstat (limited to 'builtin/common')
-rw-r--r--builtin/common/misc_helpers.lua8
1 files changed, 6 insertions, 2 deletions
diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua
index d9ebc39c3..39fca7d1e 100644
--- a/builtin/common/misc_helpers.lua
+++ b/builtin/common/misc_helpers.lua
@@ -564,7 +564,7 @@ if INIT == "mainmenu" then
return nil
end
- function fgettext(text, ...)
+ function fgettext_ne(text, ...)
text = core.gettext(text)
local arg = {n=select('#', ...), ...}
if arg.n >= 1 then
@@ -586,7 +586,11 @@ if INIT == "mainmenu" then
end
text = result
end
- return core.formspec_escape(text)
+ return text
+ end
+
+ function fgettext(text, ...)
+ return core.formspec_escape(fgettext_ne(text, ...))
end
end