Send Position packet on event, don't check it at each AsyncRunStep.

[oweals/minetest.git] / src / serverobject.h

diff --git a/src/serverobject.h b/src/serverobject.h
index 13a075a2575b52dd59ce3f99ca9caace8d8c6de8..878c37773e0fff64a7d025b8dee3a5af13a55898 100644 (file)
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -58,7 +58,7 @@ public:
        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 @@ public:
        // 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 @@ public:
        // 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";}