src/network/connection.h: Fix race condition

[minetest.git] / src / serverobject.h

diff --git a/src/serverobject.h b/src/serverobject.h
index 5de1071d17d5065d2af77ceed8e286abf8b53905..597eb63a8180be8bf76fd176a212eb16e6132606 100644 (file)
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -151,9 +151,9 @@ class ServerActiveObject : public ActiveObject
        { 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 getAnimation(v2f *frames, float *frame_speed, float *frame_blend)
+       virtual void getAnimation(v2f *frames, float *frame_speed, float *frame_blend, bool *frame_loop)
        {}
        virtual void setBonePosition(const std::string &bone, v3f position, v3f rotation)
        {}
@@ -163,6 +163,12 @@ class ServerActiveObject : public ActiveObject
        {}
        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()