From 1e94a7feaff940494a474ee549d4f2dc61f6a869 Mon Sep 17 00:00:00 2001 From: red-001 Date: Sun, 21 Jan 2018 12:28:47 +0000 Subject: Move `setlocale` from Lua to C++. --- src/script/cpp_api/s_base.cpp | 3 +++ src/script/cpp_api/s_security.cpp | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/script/cpp_api') diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp index 59107b3ff..f451156bd 100644 --- a/src/script/cpp_api/s_base.cpp +++ b/src/script/cpp_api/s_base.cpp @@ -118,6 +118,9 @@ ScriptApiBase::ScriptApiBase(ScriptingType type): lua_pushstring(m_luastack, porting::getPlatformName()); lua_setglobal(m_luastack, "PLATFORM"); + + // Make sure Lua uses the right locale + setlocale(LC_NUMERIC, "C"); } ScriptApiBase::~ScriptApiBase() diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp index 690a3b47f..6c50218d3 100644 --- a/src/script/cpp_api/s_security.cpp +++ b/src/script/cpp_api/s_security.cpp @@ -261,8 +261,7 @@ void ScriptApiSecurity::initializeSecurityClient() "clock", "date", "difftime", - "time", - "setlocale", + "time" }; static const char *debug_whitelist[] = { "getinfo", -- cgit v1.2.3