Include irrlichttypes.h first to work around Irrlicht#433 (#10872)

[minetest.git] / src / serverenvironment.h

diff --git a/src/serverenvironment.h b/src/serverenvironment.h
index af742e290acc557f087e52aedbb16a252e36d23d..a11c814ed1e9e3a419b7eb22d3f99fad376cfe6c 100644 (file)
--- a/src/serverenvironment.h
+++ b/src/serverenvironment.h
@@ -190,14 +190,6 @@ enum ClearObjectsMode {
                CLEAR_OBJECTS_MODE_QUICK,
 };
 
-/*
-       The server-side environment.
-
-       This is not thread-safe. Server uses an environment mutex.
-*/
-
-typedef std::unordered_map<u16, ServerActiveObject *> ServerActiveObjectMap;
-
 class ServerEnvironment : public Environment
 {
 public:
@@ -322,6 +314,9 @@ class ServerEnvironment : public Environment
        bool removeNode(v3s16 p);
        bool swapNode(v3s16 p, const MapNode &n);
 
+       // Find the daylight value at pos with a Depth First Search
+       u8 findSunlight(v3s16 pos) const;
+
        // Find all active objects inside a radius around a point
        void getObjectsInsideRadius(std::vector<ServerActiveObject *> &objects, const v3f &pos, float radius,
                        std::function<bool(ServerActiveObject *obj)> include_obj_cb)
@@ -329,6 +324,13 @@ class ServerEnvironment : public Environment
                return m_ao_manager.getObjectsInsideRadius(pos, radius, objects, include_obj_cb);
        }
 
+       // Find all active objects inside a box
+       void getObjectsInArea(std::vector<ServerActiveObject *> &objects, const aabb3f &box,
+                       std::function<bool(ServerActiveObject *obj)> include_obj_cb)
+       {
+               return m_ao_manager.getObjectsInArea(box, objects, include_obj_cb);
+       }
+
        // Clear objects, loading and going through every MapBlock
        void clearObjects(ClearObjectsMode mode);