Workaround failing Travis clang build.

[dragonfireclient.git] / src / serverobject.h

diff --git a/src/serverobject.h b/src/serverobject.h
index a0886ed1e4221d4f5da0e6deca967153786b2511..14752878ffac608e47e730917386ad66b47f2c36 100644 (file)
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -118,7 +118,7 @@ class ServerActiveObject : public ActiveObject
                The return value of this is passed to the client-side object
                when it is created
        */
-       virtual std::string getClientInitializationData(){return "";}
+       virtual std::string getClientInitializationData(u16 protocol_version){return "";}
        
        /*
                The return value of this is passed to the server-side object
@@ -152,9 +152,9 @@ class ServerActiveObject : public ActiveObject
 
        virtual void setArmorGroups(const ItemGroupList &armor_groups)
        {}
-       virtual void setAnimations(v2f frames, float frame_speed, float frame_blend)
+       virtual void setAnimation(v2f frames, float frame_speed, float frame_blend)
        {}
-       virtual void setBonePosRot(std::string bone, v3f position, v3f rotation)
+       virtual void setBonePosition(std::string bone, v3f position, v3f rotation)
        {}
        virtual void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)
        {}