diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-03-30 12:51:51 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-03-30 12:51:51 +0300 |
| commit | 9e7ccedba4d9a94c7f2d20013c55e82aac3fe6a3 (patch) | |
| tree | a2139176c85cae0424f64edeb21d1a2f72bb2586 /src/content_sao.h | |
| parent | b9ffb5f30d64d365e6792d0d3acff552d9fcd0fd (diff) | |
| download | minetest-9e7ccedba4d9a94c7f2d20013c55e82aac3fe6a3.tar.gz minetest-9e7ccedba4d9a94c7f2d20013c55e82aac3fe6a3.tar.bz2 minetest-9e7ccedba4d9a94c7f2d20013c55e82aac3fe6a3.zip | |
ObjectProperties
Diffstat (limited to 'src/content_sao.h')
| -rw-r--r-- | src/content_sao.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/content_sao.h b/src/content_sao.h index 48a5078b1..f0788cbd5 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "content_object.h" #include "itemgroup.h" #include "player.h" +#include "object_properties.h" ServerActiveObject* createItemSAO(ServerEnvironment *env, v3f pos, const std::string itemstring); @@ -32,8 +33,6 @@ ServerActiveObject* createItemSAO(ServerEnvironment *env, v3f pos, LuaEntitySAO needs some internals exposed. */ -struct LuaEntityProperties; - class LuaEntitySAO : public ServerActiveObject { public: @@ -80,7 +79,7 @@ private: std::string m_init_name; std::string m_init_state; bool m_registered; - struct LuaEntityProperties *m_prop; + struct ObjectProperties m_prop; s16 m_hp; v3f m_velocity; @@ -193,6 +192,7 @@ private: ItemGroupList m_armor_groups; bool m_armor_groups_sent; bool m_properties_sent; + struct ObjectProperties m_prop; public: // Some flags used by Server |