Automatically package MinGW runtime in buildbot

[dragonfireclient.git] / src / server / activeobjectmgr.h

diff --git a/src/server/activeobjectmgr.h b/src/server/activeobjectmgr.h
index a502ac6edccaaf2852a602d73da4ab605300f2e2..d43f5643c2797129de890e3b3a7259a794deabc2 100644 (file)
--- a/src/server/activeobjectmgr.h
+++ b/src/server/activeobjectmgr.h
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <functional>
 #include <vector>
 #include "../activeobjectmgr.h"
-#include "serverobject.h"
+#include "serveractiveobject.h"
 
 namespace server
 {
@@ -35,8 +35,12 @@ class ActiveObjectMgr : public ::ActiveObjectMgr<ServerActiveObject>
        bool registerObject(ServerActiveObject *obj) override;
        void removeObject(u16 id) override;
 
-       void getObjectsInsideRadius(
-                       const v3f &pos, float radius, std::vector<u16> &result);
+       void getObjectsInsideRadius(const v3f &pos, float radius,
+                       std::vector<ServerActiveObject *> &result,
+                       std::function<bool(ServerActiveObject *obj)> include_obj_cb);
+       void getObjectsInArea(const aabb3f &box,
+                       std::vector<ServerActiveObject *> &result,
+                       std::function<bool(ServerActiveObject *obj)> include_obj_cb);
 
        void getAddedActiveObjectsAroundPos(const v3f &player_pos, f32 radius,
                        f32 player_radius, std::set<u16> &current_objects,