summaryrefslogtreecommitdiff
path: root/src/content_sao.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-11-12 00:46:05 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-11-29 19:13:39 +0200
commit41c91391fce65147aa7f3b5ceb7db5758709199a (patch)
treede7e00d20b4639ed5751f542b7c43f90fd0e313f /src/content_sao.cpp
parent1ddfdc55dd01e8b9739f0754a496efabfd4a3ff1 (diff)
downloadminetest-41c91391fce65147aa7f3b5ceb7db5758709199a.tar.gz
minetest-41c91391fce65147aa7f3b5ceb7db5758709199a.tar.bz2
minetest-41c91391fce65147aa7f3b5ceb7db5758709199a.zip
Scripting WIP; Lua entity step callback works
Diffstat (limited to 'src/content_sao.cpp')
-rw-r--r--src/content_sao.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index d1303b471..3507ec154 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -1516,7 +1516,7 @@ LuaEntitySAO::~LuaEntitySAO()
{
if(m_registered){
lua_State *L = m_env->getLua();
- scriptapi_luaentity_deregister(L, m_id);
+ scriptapi_luaentity_rm(L, m_id);
}
}
@@ -1527,7 +1527,7 @@ void LuaEntitySAO::addedToEnvironment(u16 id)
// Create entity by name and state
m_registered = true;
lua_State *L = m_env->getLua();
- scriptapi_luaentity_register(L, id, m_init_name.c_str(), m_init_state.c_str());
+ scriptapi_luaentity_add(L, id, m_init_name.c_str(), m_init_state.c_str());
}
ServerActiveObject* LuaEntitySAO::create(ServerEnvironment *env, v3f pos,
@@ -1553,7 +1553,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
{
if(m_registered){
lua_State *L = m_env->getLua();
- scriptapi_luaentity_step(L, m_id, dtime, send_recommended);
+ scriptapi_luaentity_step(L, m_id, dtime);
}
}
@@ -1578,7 +1578,6 @@ std::string LuaEntitySAO::getStaticData()
// state
if(m_registered){
lua_State *L = m_env->getLua();
- scriptapi_luaentity_deregister(L, m_id);
std::string state = scriptapi_luaentity_get_state(L, m_id);
os<<serializeLongString(state);
} else {