Mapgen: Make mgv7 the default mapgen

[minetest.git] / src / serverobject.h

diff --git a/src/serverobject.h b/src/serverobject.h
index 9f8d5403c9eaeca7b8cce9cfdeefaba15919056c..9884eb0a1e3aaf08bad5001eddc6aade8325fddf 100644 (file)
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -44,7 +44,6 @@ Some planning
 
 class ServerEnvironment;
 struct ItemStack;
-class Player;
 struct ToolCapabilities;
 struct ObjectProperties;
 
@@ -69,24 +68,24 @@ class ServerActiveObject : public ActiveObject
        // environment
        virtual bool environmentDeletes() const
        { return true; }
-       
+
        // Create a certain type of ServerActiveObject
        static ServerActiveObject* create(ActiveObjectType type,
                        ServerEnvironment *env, u16 id, v3f pos,
                        const std::string &data);
-       
+
        /*
                Some simple getters/setters
        */
        v3f getBasePosition(){ return m_base_position; }
        void setBasePosition(v3f pos){ m_base_position = pos; }
        ServerEnvironment* getEnv(){ return m_env; }
-       
+
        /*
                Some more dynamic interface
        */
-       
-       virtual void setPos(v3f pos)
+
+       virtual void setPos(const v3f &pos)
                { setBasePosition(pos); }
        // continuous: if true, object does not stop immediately at pos
        virtual void moveTo(v3f pos, bool continuous)
@@ -96,7 +95,7 @@ class ServerActiveObject : public ActiveObject
        virtual float getMinimumSavedMovement();
 
        virtual std::string getDescription(){return "SAO";}
-       
+
        /*
                Step object in time.
                Messages added to messages are sent to client over network.
@@ -108,13 +107,13 @@ class ServerActiveObject : public ActiveObject
                        packet.
        */
        virtual void step(float dtime, bool send_recommended){}
-       
+
        /*
                The return value of this is passed to the client-side object
                when it is created
        */
        virtual std::string getClientInitializationData(u16 protocol_version){return "";}
-       
+
        /*
                The return value of this is passed to the server-side object
                when it is created (converted from static to active - actually
@@ -131,7 +130,7 @@ class ServerActiveObject : public ActiveObject
        */
        virtual bool isStaticAllowed() const
        {return true;}
-       
+
        // Returns tool wear
        virtual int punch(v3f dir,
                        const ToolCapabilities *toolcap=NULL,
@@ -189,6 +188,15 @@ class ServerActiveObject : public ActiveObject
        { return 0; }
        virtual ItemStack getWieldedItem() const;
        virtual bool setWieldedItem(const ItemStack &item);
+       inline void attachParticleSpawner(u32 id)
+       {
+               m_attached_particle_spawners.insert(id);
+       }
+       inline void detachParticleSpawner(u32 id)
+       {
+               m_attached_particle_spawners.erase(id);
+       }
+
 
        /*
                Number of players which know about this object. Object won't be
@@ -207,7 +215,7 @@ class ServerActiveObject : public ActiveObject
                - This can be set to true by anything else too.
        */
        bool m_removed;
-       
+
        /*
                This is set to true when an object should be removed from the active
                object list but couldn't be removed because the id has to be
@@ -218,7 +226,7 @@ class ServerActiveObject : public ActiveObject
                list.
        */
        bool m_pending_deactivation;
-       
+
        /*
                Whether the object's static data has been stored to a block
        */
@@ -228,12 +236,12 @@ class ServerActiveObject : public ActiveObject
                a copy of the static data resides.
        */
        v3s16 m_static_block;
-       
+
        /*
                Queue of messages to be sent to the client
        */
        std::queue<ActiveObjectMessage> m_messages_out;
-       
+
 protected:
        // Used for creating objects based on type
        typedef ServerActiveObject* (*Factory)
@@ -243,6 +251,7 @@ class ServerActiveObject : public ActiveObject
 
        ServerEnvironment *m_env;
        v3f m_base_position;
+       UNORDERED_SET<u32> m_attached_particle_spawners;
 
 private:
        // Used for creating objects based on type