Move `setlocale` from Lua to C++.

This commit is contained in:
red-001 2018-01-21 12:28:47 +00:00 committed by SmallJoker
parent 880a25c921
commit bb28afcfc3
3 changed files with 5 additions and 5 deletions

View File

@ -21,7 +21,6 @@ if core.print then
core.print = nil -- don't pollute our namespace core.print = nil -- don't pollute our namespace
end end
math.randomseed(os.time()) math.randomseed(os.time())
os.setlocale("C", "numeric")
minetest = core minetest = core
-- Load other files -- Load other files
@ -47,7 +46,6 @@ elseif INIT == "mainmenu" then
elseif INIT == "async" then elseif INIT == "async" then
dofile(asyncpath .. "init.lua") dofile(asyncpath .. "init.lua")
elseif INIT == "client" then elseif INIT == "client" then
os.setlocale = nil
dofile(clientpath .. "init.lua") dofile(clientpath .. "init.lua")
else else
error(("Unrecognized builtin initialization type %s!"):format(tostring(INIT))) error(("Unrecognized builtin initialization type %s!"):format(tostring(INIT)))

View File

@ -119,6 +119,9 @@ ScriptApiBase::ScriptApiBase() :
m_environment = NULL; m_environment = NULL;
m_guiengine = NULL; m_guiengine = NULL;
// Make sure Lua uses the right locale
setlocale(LC_NUMERIC, "C");
} }
ScriptApiBase::~ScriptApiBase() ScriptApiBase::~ScriptApiBase()

View File

@ -249,9 +249,8 @@ void ScriptApiSecurity::initializeSecurityClient()
static const char *os_whitelist[] = { static const char *os_whitelist[] = {
"clock", "clock",
"date", "date",
"difftime", "difftime",
"time", "time"
"setlocale",
}; };
static const char *debug_whitelist[] = { static const char *debug_whitelist[] = {
"getinfo", "getinfo",