aboutsummaryrefslogtreecommitdiff
path: root/src/script/lua_api
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2015-07-07 05:55:07 +0200
committerest31 <MTest31@outlook.com>2015-07-08 10:12:44 +0200
commitb0784ba87168e24b0533fc8718a0157cda5ea405 (patch)
tree24ca04bbfe2a13193400493e1bde5e520c589e03 /src/script/lua_api
parente234d8b3786d5adfbdf3d1a2123c3e8d91c21880 (diff)
downloadminetest-b0784ba87168e24b0533fc8718a0157cda5ea405.tar.gz
minetest-b0784ba87168e24b0533fc8718a0157cda5ea405.tar.bz2
minetest-b0784ba87168e24b0533fc8718a0157cda5ea405.zip
Use UTF-8 instead of narrow
Use wide_to_utf8 and utf8_to_wide instead of wide_to_narrow and narrow_to_wide at almost all places. Only exceptions: test functions for narrow conversion, and chat, which is done in a separate commit.
Diffstat (limited to 'src/script/lua_api')
-rw-r--r--src/script/lua_api/l_mainmenu.cpp2
-rw-r--r--src/script/lua_api/l_server.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp
index 111eba518..d209582e9 100644
--- a/src/script/lua_api/l_mainmenu.cpp
+++ b/src/script/lua_api/l_mainmenu.cpp
@@ -1057,7 +1057,7 @@ int ModApiMainMenu::l_get_video_modes(lua_State *L)
int ModApiMainMenu::l_gettext(lua_State *L)
{
std::wstring wtext = wstrgettext((std::string) luaL_checkstring(L, 1));
- lua_pushstring(L, wide_to_narrow(wtext).c_str());
+ lua_pushstring(L, wide_to_utf8(wtext).c_str());
return 1;
}
diff --git a/src/script/lua_api/l_server.cpp b/src/script/lua_api/l_server.cpp
index 0d8926317..558cc0885 100644
--- a/src/script/lua_api/l_server.cpp
+++ b/src/script/lua_api/l_server.cpp
@@ -307,7 +307,7 @@ int ModApiServer::l_kick_player(lua_State *L)
lua_pushboolean(L, false); // No such player
return 1;
}
- getServer(L)->DenyAccess_Legacy(player->peer_id, narrow_to_wide(message));
+ getServer(L)->DenyAccess_Legacy(player->peer_id, utf8_to_wide(message));
lua_pushboolean(L, true);
return 1;
}