From bdbdeab0053d9ebbaffea17effeba777b710d390 Mon Sep 17 00:00:00 2001 From: sapier Date: Sat, 23 Feb 2013 18:06:57 +0000 Subject: split scriptapi.cpp Remerge some files in order to reduce number of additional files Make necessary changes for split, rename files, reorganize some bits --- src/scriptapi_nodetimer.h | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 src/scriptapi_nodetimer.h (limited to 'src/scriptapi_nodetimer.h') diff --git a/src/scriptapi_nodetimer.h b/src/scriptapi_nodetimer.h new file mode 100644 index 000000000..184ff8cc9 --- /dev/null +++ b/src/scriptapi_nodetimer.h @@ -0,0 +1,72 @@ +/* +Minetest-c55 +Copyright (C) 2013 celeron55, Perttu Ahola + +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 LUA_NODETIMER_H_ +#define LUA_NODETIMER_H_ + +#include + +extern "C" { +#include +#include +} + +#include "environment.h" + +class NodeTimerRef +{ +private: + v3s16 m_p; + ServerEnvironment *m_env; + + static const char className[]; + static const luaL_reg methods[]; + + static int gc_object(lua_State *L); + + static NodeTimerRef *checkobject(lua_State *L, int narg); + + static int l_set(lua_State *L); + + static int l_start(lua_State *L); + + static int l_stop(lua_State *L); + + static int l_is_started(lua_State *L); + + static int l_get_timeout(lua_State *L); + + static int l_get_elapsed(lua_State *L); + +public: + NodeTimerRef(v3s16 p, ServerEnvironment *env); + ~NodeTimerRef(); + + // Creates an NodeTimerRef and leaves it on top of stack + // Not callable from Lua; all references are created on the C side. + static void create(lua_State *L, v3s16 p, ServerEnvironment *env); + + static void set_null(lua_State *L); + + static void Register(lua_State *L); +}; + + + +#endif /* LUA_NODETIMER_H_ */ -- cgit v1.2.3 From b9512cab1b995e74c11b12139fe9320c02ff2060 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Wed, 6 Mar 2013 09:31:06 -0500 Subject: Fix Irrlicht includes in scriptapi_* --- src/scriptapi.h | 2 ++ src/scriptapi_inventory.h | 2 -- src/scriptapi_item.h | 1 - src/scriptapi_node.h | 1 - src/scriptapi_nodemeta.h | 2 -- src/scriptapi_nodetimer.h | 2 -- src/scriptapi_noise.cpp | 3 --- 7 files changed, 2 insertions(+), 11 deletions(-) (limited to 'src/scriptapi_nodetimer.h') diff --git a/src/scriptapi.h b/src/scriptapi.h index 4a0b07894..7f19bcef5 100644 --- a/src/scriptapi.h +++ b/src/scriptapi.h @@ -23,6 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include +#include "irr_v3d.h" +#include "irr_v2d.h" extern "C" { #include diff --git a/src/scriptapi_inventory.h b/src/scriptapi_inventory.h index 029007352..14f4fe026 100644 --- a/src/scriptapi_inventory.h +++ b/src/scriptapi_inventory.h @@ -20,8 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef LUA_INVENTORY_H_ #define LUA_INVENTORY_H_ -#include - extern "C" { #include #include diff --git a/src/scriptapi_item.h b/src/scriptapi_item.h index 38d64a2cc..e0f213990 100644 --- a/src/scriptapi_item.h +++ b/src/scriptapi_item.h @@ -25,7 +25,6 @@ extern "C" { #include } -#include #include #include "itemdef.h" diff --git a/src/scriptapi_node.h b/src/scriptapi_node.h index c00df9dc5..665b58bfc 100644 --- a/src/scriptapi_node.h +++ b/src/scriptapi_node.h @@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef LUA_NODE_H_ #define LUA_NODE_H_ -#include #include #include diff --git a/src/scriptapi_nodemeta.h b/src/scriptapi_nodemeta.h index 6d1802a9c..017abe181 100644 --- a/src/scriptapi_nodemeta.h +++ b/src/scriptapi_nodemeta.h @@ -19,8 +19,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef LUA_NODEMETA_H_ #define LUA_NODEMETA_H_ -#include - extern "C" { #include #include diff --git a/src/scriptapi_nodetimer.h b/src/scriptapi_nodetimer.h index 184ff8cc9..a4536d947 100644 --- a/src/scriptapi_nodetimer.h +++ b/src/scriptapi_nodetimer.h @@ -20,8 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef LUA_NODETIMER_H_ #define LUA_NODETIMER_H_ -#include - extern "C" { #include #include diff --git a/src/scriptapi_noise.cpp b/src/scriptapi_noise.cpp index 86f6e3097..1dd6ef8e0 100644 --- a/src/scriptapi_noise.cpp +++ b/src/scriptapi_noise.cpp @@ -22,9 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "scriptapi_types.h" #include "script.h" -#include - - // garbage collector int LuaPerlinNoise::gc_object(lua_State *L) { -- cgit v1.2.3