From d7bc346981e189851e490f2417ed015a38bca79b Mon Sep 17 00:00:00 2001
From: red-001 <red-001@outlook.ie>
Date: Sun, 22 Jan 2017 08:05:09 +0000
Subject: [CSM] Add client-sided chat commands (#5092)

---
 src/client.cpp                  |  6 +-----
 src/script/lua_api/l_client.cpp | 23 +++++++++++++++++++++++
 src/script/lua_api/l_client.h   |  8 ++++++++
 3 files changed, 32 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/client.cpp b/src/client.cpp
index 0af6b4595..3a3e0673e 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1582,11 +1582,7 @@ void Client::typeChatMessage(const std::wstring &message)
 	sendChatMessage(message);
 
 	// Show locally
-	if (message[0] == L'/')
-	{
-		pushToChatQueue((std::wstring)L"issued command: " + message);
-	}
-	else
+	if (message[0] != L'/')
 	{
 		// compatibility code
 		if (m_proto_ver < 29) {
diff --git a/src/script/lua_api/l_client.cpp b/src/script/lua_api/l_client.cpp
index f4c3812ac..7eb340d78 100644
--- a/src/script/lua_api/l_client.cpp
+++ b/src/script/lua_api/l_client.cpp
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "l_client.h"
 #include "l_internal.h"
 #include "util/string.h"
+#include "cpp_api/s_base.h"
 
 int ModApiClient::l_get_current_modname(lua_State *L)
 {
@@ -28,6 +29,26 @@ int ModApiClient::l_get_current_modname(lua_State *L)
 	return 1;
 }
 
+// get_last_run_mod()
+int ModApiClient::l_get_last_run_mod(lua_State *L)
+{
+	lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
+	const char *current_mod = lua_tostring(L, -1);
+	if (current_mod == NULL || current_mod[0] == '\0') {
+		lua_pop(L, 1);
+		lua_pushstring(L, getScriptApiBase(L)->getOrigin().c_str());
+	}
+	return 1;
+}
+
+// set_last_run_mod(modname)
+int ModApiClient::l_set_last_run_mod(lua_State *L)
+{
+	const char *mod = lua_tostring(L, 1);
+	getScriptApiBase(L)->setOriginDirect(mod);
+	return 0;
+}
+
 // display_chat_message(message)
 int ModApiClient::l_display_chat_message(lua_State *L)
 {
@@ -42,4 +63,6 @@ void ModApiClient::Initialize(lua_State *L, int top)
 {
 	API_FCT(get_current_modname);
 	API_FCT(display_chat_message);
+	API_FCT(set_last_run_mod);
+	API_FCT(get_last_run_mod);
 }
diff --git a/src/script/lua_api/l_client.h b/src/script/lua_api/l_client.h
index b4a57cb61..e3106e742 100644
--- a/src/script/lua_api/l_client.h
+++ b/src/script/lua_api/l_client.h
@@ -28,8 +28,16 @@ class ModApiClient : public ModApiBase
 private:
 	// get_current_modname()
 	static int l_get_current_modname(lua_State *L);
+
+	// display_chat_message(message)
 	static int l_display_chat_message(lua_State *L);
 
+	// get_last_run_mod(n)
+	static int l_get_last_run_mod(lua_State *L);
+
+	// set_last_run_mod(modname)
+	static int l_set_last_run_mod(lua_State *L);
+
 public:
 	static void Initialize(lua_State *L, int top);
 };
-- 
cgit v1.2.3