Fix addon and configuration file paths

[minetest.git] / src / environment.h

diff --git a/src/environment.h b/src/environment.h
index 2cdfb4b4858404e8f0f2fffbb4057bf9b93195e8..fcd16e2967bebd271303940541af8894a08f991f 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -39,6 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "activeobject.h"
 
 class Server;
+class ServerEnvironment;
 class ActiveBlockModifier;
 class ServerActiveObject;
 typedef struct lua_State lua_State;
@@ -108,9 +109,15 @@ class ActiveBlockModifier
        ActiveBlockModifier(){};
        virtual ~ActiveBlockModifier(){};
        
+       // Set of contents to trigger on
        virtual std::set<std::string> getTriggerContents()=0;
+       // Set of required neighbors (trigger doesn't happen if none are found)
+       // Empty = do not check neighbors
+       virtual std::set<std::string> getRequiredNeighbors()
+       { return std::set<std::string>(); }
+       // Trigger interval in seconds
        virtual float getTriggerInterval() = 0;
-       // chance of (1 / return value), 0 is disallowed
+       // Random chance of (1 / return value), 0 is disallowed
        virtual u32 getTriggerChance() = 0;
        // This is called usually at interval for 1/chance of the nodes
        virtual void trigger(ServerEnvironment *env, v3s16 p, MapNode n){};
@@ -123,9 +130,7 @@ struct ABMWithState
        ActiveBlockModifier *abm;
        float timer;
 
-       ABMWithState(ActiveBlockModifier *abm_):
-               abm(abm_)
-       {}
+       ABMWithState(ActiveBlockModifier *abm_);
 };
 
 /*
@@ -255,18 +260,24 @@ class ServerEnvironment : public Environment
        void activateBlock(MapBlock *block, u32 additional_dtime=0);
 
        /*
-               ActiveBlockModifiers (TODO)
+               ActiveBlockModifiers
                -------------------------------------------
-               NOTE: Not used currently (TODO: Use or remove)
        */
 
        void addActiveBlockModifier(ActiveBlockModifier *abm);
 
-       /* Other stuff */
+       /*
+               Other stuff
+               -------------------------------------------
+       */
+       
+       // Find all active objects inside a radius around a point
+       std::set<u16> getObjectsInsideRadius(v3f pos, float radius);
        
        // Clear all objects, loading and going through every MapBlock
        void clearAllObjects();
        
+       // This makes stuff happen
        void step(f32 dtime);
        
 private:
@@ -345,6 +356,7 @@ class ServerEnvironment : public Environment
 #ifndef SERVER
 
 #include "clientobject.h"
+class ClientSimpleObject;
 
 /*
        The client-side environment.
@@ -368,6 +380,7 @@ struct ClientEnvEvent
                } none;
                struct{
                        u8 amount;
+                       bool send_to_server;
                } player_damage;
        };
 };
@@ -412,6 +425,12 @@ class ClientEnvironment : public Environment
                }
        }
 
+       /*
+               ClientSimpleObjects
+       */
+
+       void addSimpleObject(ClientSimpleObject *simple);
+
        /*
                ActiveObjects
        */
@@ -457,6 +476,7 @@ class ClientEnvironment : public Environment
        IGameDef *m_gamedef;
        IrrlichtDevice *m_irr;
        core::map<u16, ClientActiveObject*> m_active_objects;
+       core::list<ClientSimpleObject*> m_simple_objects;
        Queue<ClientEnvEvent> m_client_event_queue;
        IntervalLimiter m_active_object_light_update_interval;
        IntervalLimiter m_lava_hurt_interval;