summaryrefslogtreecommitdiff
path: root/src/scriptapi.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-03-30 12:51:51 +0300
committerPerttu Ahola <celeron55@gmail.com>2012-03-30 12:51:51 +0300
commit9e7ccedba4d9a94c7f2d20013c55e82aac3fe6a3 (patch)
treea2139176c85cae0424f64edeb21d1a2f72bb2586 /src/scriptapi.cpp
parentb9ffb5f30d64d365e6792d0d3acff552d9fcd0fd (diff)
downloadminetest-9e7ccedba4d9a94c7f2d20013c55e82aac3fe6a3.tar.gz
minetest-9e7ccedba4d9a94c7f2d20013c55e82aac3fe6a3.tar.bz2
minetest-9e7ccedba4d9a94c7f2d20013c55e82aac3fe6a3.zip
ObjectProperties
Diffstat (limited to 'src/scriptapi.cpp')
-rw-r--r--src/scriptapi.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 4c40fa589..1ef6d0e72 100644
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -33,8 +33,7 @@ extern "C" {
#include "filesys.h"
#include "serverobject.h"
#include "script.h"
-//#include "luna.h"
-#include "luaentity_common.h"
+#include "object_properties.h"
#include "content_sao.h" // For LuaEntitySAO and PlayerSAO
#include "itemdef.h"
#include "nodedef.h"
@@ -4679,7 +4678,7 @@ std::string scriptapi_luaentity_get_staticdata(lua_State *L, u16 id)
}
void scriptapi_luaentity_get_properties(lua_State *L, u16 id,
- LuaEntityProperties *prop)
+ ObjectProperties *prop)
{
realitycheck(L);
assert(lua_checkstack(L, 20));