Fix jumping at node edge

[minetest.git] / src / serverobject.h

diff --git a/src/serverobject.h b/src/serverobject.h
index ece53fd98f278e1255c20d2c053ad575a5de7130..597eb63a8180be8bf76fd176a212eb16e6132606 100644 (file)
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -58,7 +58,7 @@ class ServerActiveObject : public ActiveObject
        ServerActiveObject(ServerEnvironment *env, v3f pos);
        virtual ~ServerActiveObject();
 
-       virtual u8 getSendType() const
+       virtual ActiveObjectType getSendType() const
        { return getType(); }
 
        // Called after id has been set and has been inserted in environment
@@ -69,12 +69,9 @@ class ServerActiveObject : public ActiveObject
        // environment
        virtual bool environmentDeletes() const
        { return true; }
-
-       virtual bool unlimitedTransferDistance() const
-       { return false; }
        
        // Create a certain type of ServerActiveObject
-       static ServerActiveObject* create(u8 type,
+       static ServerActiveObject* create(ActiveObjectType type,
                        ServerEnvironment *env, u16 id, v3f pos,
                        const std::string &data);
        
@@ -97,8 +94,6 @@ class ServerActiveObject : public ActiveObject
        // If object has moved less than this and data has not changed,
        // saving to disk may be omitted
        virtual float getMinimumSavedMovement();
-       
-       virtual bool isPeaceful(){return true;}
 
        virtual std::string getDescription(){return "SAO";}
        
@@ -118,7 +113,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,6 +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, bool frame_loop)
+       {}
+       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)
+       {}
+       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()
@@ -215,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
@@ -229,7 +246,7 @@ class ServerActiveObject : public ActiveObject
 
 private:
        // Used for creating objects based on type
-       static core::map<u16, Factory> m_types;
+       static std::map<u16, Factory> m_types;
 };
 
 #endif