From 2818d3f2244d2146a5cdb61cd41f6561c514f97c Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Tue, 25 Apr 2017 13:38:08 -0400 Subject: Rename Scripting API files for consistency --- src/script/scripting_client.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/script/scripting_client.h (limited to 'src/script/scripting_client.h') diff --git a/src/script/scripting_client.h b/src/script/scripting_client.h new file mode 100644 index 000000000..df94e8b71 --- /dev/null +++ b/src/script/scripting_client.h @@ -0,0 +1,42 @@ +/* +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola +Copyright (C) 2017 nerzhul, Loic Blot + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#ifndef CLIENT_SCRIPTING_H_ +#define CLIENT_SCRIPTING_H_ + +#include "cpp_api/s_base.h" +#include "cpp_api/s_client.h" +#include "cpp_api/s_security.h" + +class Client; +class LocalPlayer; +class ClientScripting: + virtual public ScriptApiBase, + public ScriptApiSecurity, + public ScriptApiClient +{ +public: + ClientScripting(Client *client); + void on_client_ready(LocalPlayer *localplayer); + +private: + virtual void InitializeModApi(lua_State *L, int top); +}; +#endif -- cgit v1.2.3 From b82e5ec8804e9058b48f3d2a168a4c019a777055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Thu, 27 Apr 2017 11:52:44 +0200 Subject: Don't permit to copy Scripting classes (Client,Server,Mainmenu) --- src/script/scripting_client.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/script/scripting_client.h') diff --git a/src/script/scripting_client.h b/src/script/scripting_client.h index df94e8b71..b3451e409 100644 --- a/src/script/scripting_client.h +++ b/src/script/scripting_client.h @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "cpp_api/s_base.h" #include "cpp_api/s_client.h" #include "cpp_api/s_security.h" +#include "util/basic_macros.h" class Client; class LocalPlayer; @@ -38,5 +39,6 @@ public: private: virtual void InitializeModApi(lua_State *L, int top); + DISABLE_CLASS_COPY(ClientScripting); }; #endif -- cgit v1.2.3 From de028fc056b26e03ee00324888f870f64e28c756 Mon Sep 17 00:00:00 2001 From: bigfoot547 Date: Fri, 5 May 2017 15:07:36 -0500 Subject: [CSM] Add camera API (#5609) * [CSM] Add camera API roper rebase & squash * Address nerzhul's review --- src/script/scripting_client.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/script/scripting_client.h') diff --git a/src/script/scripting_client.h b/src/script/scripting_client.h index b3451e409..c13fde607 100644 --- a/src/script/scripting_client.h +++ b/src/script/scripting_client.h @@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc., class Client; class LocalPlayer; +class Camera; class ClientScripting: virtual public ScriptApiBase, public ScriptApiSecurity, @@ -36,6 +37,7 @@ class ClientScripting: public: ClientScripting(Client *client); void on_client_ready(LocalPlayer *localplayer); + void on_camera_ready(Camera *camera); private: virtual void InitializeModApi(lua_State *L, int top); -- cgit v1.2.3