maualy merged object linking interface from cao_sao_split patchsapier-20120207

1 files changed, 4 insertions, 1 deletions

diff --git a/src/content_sao.h b/src/content_sao.h
index 6db320ab4..1036bdcd4 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serverobject.h"
 #include "content_object.h"
 #include "collidableobject.h"
+#include "serverlinkableobject.h"
 
 class TestSAO : public ServerActiveObject
 {
@@ -193,7 +194,7 @@ private:
 
 struct LuaEntityProperties;
 
-class LuaEntitySAO : public ServerActiveObject, public CollidableObject
+class LuaEntitySAO : public ServerActiveObject, public CollidableObject , public ServerLinkableObject
 {
 public:
 	LuaEntitySAO(ServerEnvironment *env, v3f pos,
@@ -224,6 +225,8 @@ public:
 			bool select_horiz_by_yawpitch);
 	std::string getName();
 	aabb3f* getCollisionBox();
+	bool sendLinkMsg(ServerActiveObject* parent,v3f offset);
+	bool sendUnlinkMsg();
 private:
 	void sendPosition(bool do_interpolate, bool is_movement_end);