From 30821ad8deb42728fbba9de60dda31033f70aaac Mon Sep 17 00:00:00 2001
From: red-001 <red-001@outlook.ie>
Date: Thu, 4 Jan 2018 07:21:12 +0000
Subject: [CSM] Don't load the IO library. (#6087)

* [CSM] Don't load the IO library.

* Rename the function to match the Lua API function name and add a missing `const`

* Add a comment to explain some strange code and fix the other issues pointed out by shadowninja.
---
 src/script/cpp_api/s_base.h | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'src/script/cpp_api/s_base.h')

diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h
index a170f82dc..18cb841cf 100644
--- a/src/script/cpp_api/s_base.h
+++ b/src/script/cpp_api/s_base.h
@@ -23,15 +23,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string>
 #include <thread>
 #include <mutex>
+#include <unordered_map>
 #include "util/basic_macros.h"
 
 extern "C" {
 #include <lua.h>
+#include <lualib.h>
 }
 
 #include "irrlichttypes.h"
 #include "common/c_types.h"
 #include "common/c_internal.h"
+#include "debug.h"
+#include "cmake_config.h"
 
 #define SCRIPTAPI_LOCK_DEBUG
 #define SCRIPTAPI_DEBUG
@@ -54,9 +58,10 @@ extern "C" {
 	setOriginFromTableRaw(index, __FUNCTION__)
 
 enum class ScriptingType: u8 {
+	Async,
 	Client,
-	Server,
-	MainMenu
+	MainMenu,
+	Server
 };
 
 class Server;
@@ -70,7 +75,12 @@ class ServerActiveObject;
 
 class ScriptApiBase {
 public:
-	ScriptApiBase();
+	ScriptApiBase(ScriptingType type);
+	// fake constructor to allow script API classes (e.g ScriptApiEnv) to virtually inherit from this one.
+	ScriptApiBase()
+	{
+		FATAL_ERROR("ScriptApiBase created without ScriptingType!");
+	}
 	virtual ~ScriptApiBase();
 	DISABLE_CLASS_COPY(ScriptApiBase);
 
@@ -91,7 +101,6 @@ public:
 
 	IGameDef *getGameDef() { return m_gamedef; }
 	Server* getServer();
-	void setType(ScriptingType type) { m_type = type; }
 	ScriptingType getType() { return m_type; }
 #ifndef SERVER
 	Client* getClient();
@@ -101,6 +110,8 @@ public:
 	void setOriginDirect(const char *origin);
 	void setOriginFromTableRaw(int index, const char *fxn);
 
+	void clientOpenLibs(lua_State *L);
+
 protected:
 	friend class LuaABM;
 	friend class LuaLBM;
-- 
cgit v1.2.3