Fix jumping at node edge

[minetest.git] / src / serverobject.h

diff --git a/src/serverobject.h b/src/serverobject.h
index 878c37773e0fff64a7d025b8dee3a5af13a55898..597eb63a8180be8bf76fd176a212eb16e6132606 100644 (file)
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -147,14 +147,28 @@ class ServerActiveObject : public ActiveObject
 
        virtual void setArmorGroups(const ItemGroupList &armor_groups)
        {}
+       virtual ItemGroupList getArmorGroups()
+       { return ItemGroupList(); }
        virtual void setPhysicsOverride(float physics_override_speed, float physics_override_jump, float physics_override_gravity)
        {}
-       virtual void setAnimation(v2f frames, float frame_speed, float frame_blend)
+       virtual void setAnimation(v2f frames, float frame_speed, float frame_blend, bool frame_loop)
        {}
-       virtual void setBonePosition(std::string bone, v3f position, v3f rotation)
+       virtual void getAnimation(v2f *frames, float *frame_speed, float *frame_blend, bool *frame_loop)
        {}
-       virtual void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)
+       virtual void setBonePosition(const std::string &bone, v3f position, v3f rotation)
        {}
+       virtual void getBonePosition(const std::string &bone, v3f *position, v3f *lotation)
+       {}
+       virtual void setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation)
+       {}
+       virtual void getAttachment(int *parent_id, std::string *bone, v3f *position, v3f *rotation)
+       {}
+       virtual void addAttachmentChild(int child_id)
+       {}
+       virtual void removeAttachmentChild(int child_id)
+       {}
+       virtual std::set<int> getAttachmentChildIds()
+       { return std::set<int>(); }
        virtual ObjectProperties* accessObjectProperties()
        { return NULL; }
        virtual void notifyObjectPropertiesModified()
@@ -218,7 +232,7 @@ class ServerActiveObject : public ActiveObject
        /*
                Queue of messages to be sent to the client
        */
-       Queue<ActiveObjectMessage> m_messages_out;
+       std::queue<ActiveObjectMessage> m_messages_out;
        
 protected:
        // Used for creating objects based on type