1 files changed, 43 insertions, 2 deletions

diff --git a/src/script/lua_api/l_client.cpp b/src/script/lua_api/l_client.cpp
index 7eb340d78..9a04bd02f 100644
--- a/src/script/lua_api/l_client.cpp
+++ b/src/script/lua_api/l_client.cpp
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "l_internal.h"
 #include "util/string.h"
 #include "cpp_api/s_base.h"
+#include "gettext.h"
 
 int ModApiClient::l_get_current_modname(lua_State *L)
 {
@@ -44,18 +45,55 @@ int ModApiClient::l_get_last_run_mod(lua_State *L)
 // set_last_run_mod(modname)
 int ModApiClient::l_set_last_run_mod(lua_State *L)
 {
+	if (!lua_isstring(L, 1))
+		return 0;
+
 	const char *mod = lua_tostring(L, 1);
 	getScriptApiBase(L)->setOriginDirect(mod);
-	return 0;
+	lua_pushboolean(L, true);
+	return 1;
 }
 
 // display_chat_message(message)
 int ModApiClient::l_display_chat_message(lua_State *L)
 {
-	NO_MAP_LOCK_REQUIRED;
+	if (!lua_isstring(L, 1))
+		return 0;
 
 	std::string message = luaL_checkstring(L, 1);
 	getClient(L)->pushToChatQueue(utf8_to_wide(message));
+	lua_pushboolean(L, true);
+	return 1;
+}
+
+// show_formspec(formspec)
+int ModApiClient::l_show_formspec(lua_State *L)
+{
+	if ( !lua_isstring(L, 1) || !lua_isstring(L, 2) )
+		return 0;
+
+	ClientEvent event;
+	event.type = CE_SHOW_LOCAL_FORMSPEC;
+	event.show_formspec.formname = new std::string(luaL_checkstring(L, 1));
+	event.show_formspec.formspec = new std::string(luaL_checkstring(L, 2));
+	getClient(L)->pushToEventQueue(event);
+	lua_pushboolean(L, true);
+	return 1;
+}
+
+// send_respawn()
+int ModApiClient::l_send_respawn(lua_State *L)
+{
+	getClient(L)->sendRespawn();
+	return 0;
+}
+
+// gettext(text)
+int ModApiClient::l_gettext(lua_State *L)
+{
+	std::string text = strgettext(std::string(luaL_checkstring(L, 1)));
+	lua_pushstring(L, text.c_str());
+
 	return 1;
 }
 
@@ -65,4 +103,7 @@ void ModApiClient::Initialize(lua_State *L, int top)
 	API_FCT(display_chat_message);
 	API_FCT(set_last_run_mod);
 	API_FCT(get_last_run_mod);
+	API_FCT(show_formspec);
+	API_FCT(send_respawn);
+	API_FCT(gettext);
 }