summaryrefslogtreecommitdiff
path: root/builtin/common/misc_helpers.lua
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:09:59 +0100
commit5a0ed780f56a5225b3d7c5f64099586e390e5f39 (patch)
tree8d027371f69fab8b3b3893841b3663d2a0411d22 /builtin/common/misc_helpers.lua
parent8941ea0cc9ae899c8e43743c7a4efc7e9db9c489 (diff)
downloadminetest-5a0ed780f56a5225b3d7c5f64099586e390e5f39.tar.gz
minetest-5a0ed780f56a5225b3d7c5f64099586e390e5f39.tar.bz2
minetest-5a0ed780f56a5225b3d7c5f64099586e390e5f39.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/misc_helpers.lua')
-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