summaryrefslogtreecommitdiff
path: root/src/environment.h
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2013-05-25 00:51:02 +0200
committerKahrl <kahrl@gmx.net>2013-05-25 00:51:02 +0200
commitab433775777c4f5055bcf4d2a1cffc506c4f9961 (patch)
tree9f80c74c95cbb1efa15c0c36df8d5e35235e5554 /src/environment.h
parent865f380c91ced850d1a499c91aa2ab5489624802 (diff)
downloadminetest-ab433775777c4f5055bcf4d2a1cffc506c4f9961.tar.gz
minetest-ab433775777c4f5055bcf4d2a1cffc506c4f9961.tar.bz2
minetest-ab433775777c4f5055bcf4d2a1cffc506c4f9961.zip
Move scriptapi to separate folder (by sapier)
On the lua side, notably minetest.env:<function>(<args>) should now be replaced by minetest.<function>(<args>). The old way is and will stay supported for a long time. Also: Update and clean up lua_api.txt (by celeron55) Move EnvRef to lua and remove add_rat and add_firefly (by kahrl) Add separate src/util/CMakeLists.txt, other minor fixes (by kahrl)
Diffstat (limited to 'src/environment.h')
-rw-r--r--src/environment.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/environment.h b/src/environment.h
index a3e43dbb4..a62173a11 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -50,6 +50,7 @@ class IGameDef;
class Map;
class ServerMap;
class ClientMap;
+class ScriptApi;
class Environment
{
@@ -190,7 +191,7 @@ public:
class ServerEnvironment : public Environment
{
public:
- ServerEnvironment(ServerMap *map, lua_State *L, IGameDef *gamedef,
+ ServerEnvironment(ServerMap *map, ScriptApi *iface, IGameDef *gamedef,
IBackgroundBlockEmerger *emerger);
~ServerEnvironment();
@@ -198,8 +199,9 @@ public:
ServerMap & getServerMap();
- lua_State* getLua()
- { return m_lua; }
+ //TODO find way to remove this fct!
+ ScriptApi* getScriptIface()
+ { return m_script; }
IGameDef *getGameDef()
{ return m_gamedef; }
@@ -348,7 +350,7 @@ private:
// The map
ServerMap *m_map;
// Lua state
- lua_State *m_lua;
+ ScriptApi* m_script;
// Game definition
IGameDef *m_gamedef;
// Background block emerger (the server, in practice)