diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-01-22 11:17:41 +0100 |
---|---|---|
committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-03-13 23:56:05 +0100 |
commit | 2c19d51409ca903021e0b508e5bc15299c4e51dc (patch) | |
tree | 8df932580abc289160aadbc40487099fd033c7d8 /src/clientenvironment.h | |
parent | d7bc346981e189851e490f2417ed015a38bca79b (diff) | |
download | minetest-2c19d51409ca903021e0b508e5bc15299c4e51dc.tar.gz minetest-2c19d51409ca903021e0b508e5bc15299c4e51dc.tar.bz2 minetest-2c19d51409ca903021e0b508e5bc15299c4e51dc.zip |
[CSM] sound_play & sound_stop support + client_lua_api doc (#5096)
* squashed: CSM: Implement register_globalstep
* Re-use fatal error mechanism from server to disconnect client on CSM error
* Little client functions cleanups
* squashed: CSM: add core.after function
* core.after is shared code between client & server
* ModApiUtil get_us_time feature enabled for client
Diffstat (limited to 'src/clientenvironment.h')
-rw-r--r-- | src/clientenvironment.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/clientenvironment.h b/src/clientenvironment.h index b30a7a6d7..c273ede54 100644 --- a/src/clientenvironment.h +++ b/src/clientenvironment.h @@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc., class ClientSimpleObject; class ClientMap; +class ClientScripting; class ClientActiveObject; class GenericCAO; class LocalPlayer; @@ -75,6 +76,7 @@ public: ClientMap & getClientMap(); Client *getGameDef() { return m_client; } + void setScript(ClientScripting *script) { m_script = script; } void step(f32 dtime); @@ -176,6 +178,7 @@ private: scene::ISceneManager *m_smgr; ITextureSource *m_texturesource; Client *m_client; + ClientScripting *m_script; IrrlichtDevice *m_irr; UNORDERED_MAP<u16, ClientActiveObject*> m_active_objects; std::vector<ClientSimpleObject*> m_simple_objects; |