fix: drop old irrlicht <1.8 compat on Client::loadMedia

[dragonfireclient.git] / src / serverenvironment.h

diff --git a/src/serverenvironment.h b/src/serverenvironment.h
index cfd5b8f3eb7e3b6f5426ea0de4aa7a6b0bcaacde..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:
@@ -332,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);