Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move setlocale from Lua to C++.

Browse Source
This commit is contained in:
red-001 2018-01-21 12:28:47 +00:00 committed by sfan5
parent 0e4c467a82
commit 1e94a7feaf
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/init.lua
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)))

3
src/script/cpp_api/s_base.cpp
View File

@ -118,6 +118,9 @@ ScriptApiBase::ScriptApiBase(ScriptingType type):
lua_pushstring(m_luastack, porting::getPlatformName()); lua_pushstring(m_luastack, porting::getPlatformName());
lua_setglobal(m_luastack, "PLATFORM"); lua_setglobal(m_luastack, "PLATFORM");
// Make sure Lua uses the right locale
setlocale(LC_NUMERIC, "C");
} }
ScriptApiBase::~ScriptApiBase() ScriptApiBase::~ScriptApiBase()

3
src/script/cpp_api/s_security.cpp
View File

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