summaryrefslogtreecommitdiff
path: root/src/content_sao.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-11-11 20:50:09 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-11-29 19:13:39 +0200
commita6a1e6ed1a8de1294970a5af6ba992c38d4022b8 (patch)
treef16285a594a3b55a3353e7fb97b2a22b56eed3ea /src/content_sao.cpp
parentf8430723e0c2d13470e430af2e4f4be5e64f82f3 (diff)
downloadminetest-a6a1e6ed1a8de1294970a5af6ba992c38d4022b8.tar.gz
minetest-a6a1e6ed1a8de1294970a5af6ba992c38d4022b8.tar.bz2
minetest-a6a1e6ed1a8de1294970a5af6ba992c38d4022b8.zip
random scripting work-in-progress
Diffstat (limited to 'src/content_sao.cpp')
-rw-r--r--src/content_sao.cpp17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index d51e92a8c..d1303b471 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -1576,9 +1576,22 @@ std::string LuaEntitySAO::getStaticData()
// name
os<<serializeString(m_init_name);
// state
- std::string state = scriptapi_luaentity_get_state(L, m_id);
- os<<serializeString(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 {
+ os<<serializeLongString(m_init_state);
+ }
return os.str();
}
+InventoryItem* LuaEntitySAO::createPickedUpItem()
+{
+ std::istringstream is("CraftItem testobject1 1", std::ios_base::binary);
+ InventoryItem *item = InventoryItem::deSerialize(is);
+ return item;
+}
+