1 files changed, 25 insertions, 29 deletions

diff --git a/modules/bullet/area_bullet.h b/modules/bullet/area_bullet.h
index 0272350510..51fbc1f71d 100644
--- a/modules/bullet/area_bullet.h
+++ b/modules/bullet/area_bullet.h
@@ -32,7 +32,7 @@
 #define AREABULLET_H
 
 #include "collision_object_bullet.h"
-#include "core/vector.h"
+#include "core/local_vector.h"
 #include "servers/physics_server_3d.h"
 #include "space_bullet.h"
 
@@ -61,12 +61,10 @@ public:
 	};
 
 	struct OverlappingObjectData {
-		CollisionObjectBullet *object;
-		OverlapState state;
+		CollisionObjectBullet *object = nullptr;
+		OverlapState state = OVERLAP_STATE_ENTER;
 
-		OverlappingObjectData() :
-				object(nullptr),
-				state(OVERLAP_STATE_ENTER) {}
+		OverlappingObjectData() {}
 		OverlappingObjectData(CollisionObjectBullet *p_object, OverlapState p_state) :
 				object(p_object),
 				state(p_state) {}
@@ -85,20 +83,18 @@ private:
 	Variant *call_event_res_ptr[5];
 
 	btGhostObject *btGhost;
-	Vector<OverlappingObjectData> overlappingObjects;
-	bool monitorable;
-
-	PhysicsServer3D::AreaSpaceOverrideMode spOv_mode;
-	bool spOv_gravityPoint;
-	real_t spOv_gravityPointDistanceScale;
-	real_t spOv_gravityPointAttenuation;
-	Vector3 spOv_gravityVec;
-	real_t spOv_gravityMag;
-	real_t spOv_linearDump;
-	real_t spOv_angularDump;
-	int spOv_priority;
-
-	bool isScratched;
+	LocalVector<OverlappingObjectData> overlappingObjects;
+	bool monitorable = true;
+
+	PhysicsServer3D::AreaSpaceOverrideMode spOv_mode = PhysicsServer3D::AREA_SPACE_OVERRIDE_DISABLED;
+	bool spOv_gravityPoint = false;
+	real_t spOv_gravityPointDistanceScale = 0;
+	real_t spOv_gravityPointAttenuation = 1;
+	Vector3 spOv_gravityVec = Vector3(0, -1, 0);
+	real_t spOv_gravityMag = 10;
+	real_t spOv_linearDump = 0.1;
+	real_t spOv_angularDump = 0.1;
+	int spOv_priority = 0;
 
 	InOutEventCallback eventsCallbacks[2];
 
@@ -141,11 +137,11 @@ public:
 	_FORCE_INLINE_ void set_spOv_priority(int p_priority) { spOv_priority = p_priority; }
 	_FORCE_INLINE_ int get_spOv_priority() { return spOv_priority; }
 
-	virtual void main_shape_changed();
-	virtual void reload_body();
-	virtual void set_space(SpaceBullet *p_space);
+	virtual void main_shape_changed() override;
+	virtual void do_reload_body() override;
+	virtual void set_space(SpaceBullet *p_space) override;
 
-	virtual void dispatch_callbacks();
+	virtual void dispatch_callbacks() override;
 	void call_event(CollisionObjectBullet *p_otherObject, PhysicsServer3D::AreaBodyStatus p_status);
 	void set_on_state_change(ObjectID p_id, const StringName &p_method, const Variant &p_udata = Variant());
 	void scratch();
@@ -154,9 +150,9 @@ public:
 	// Dispatch the callbacks and removes from overlapping list
 	void remove_overlap(CollisionObjectBullet *p_object, bool p_notify);
 
-	virtual void on_collision_filters_change();
-	virtual void on_collision_checker_start() {}
-	virtual void on_collision_checker_end() { isTransformChanged = false; }
+	virtual void do_reload_collision_filters() override;
+	virtual void on_collision_checker_start() override {}
+	virtual void on_collision_checker_end() override { isTransformChanged = false; }
 
 	void add_overlap(CollisionObjectBullet *p_otherObject);
 	void put_overlap_as_exit(int p_index);
@@ -168,8 +164,8 @@ public:
 	void set_event_callback(Type p_callbackObjectType, ObjectID p_id, const StringName &p_method);
 	bool has_event_callback(Type p_callbackObjectType);
 
-	virtual void on_enter_area(AreaBullet *p_area);
-	virtual void on_exit_area(AreaBullet *p_area);
+	virtual void on_enter_area(AreaBullet *p_area) override;
+	virtual void on_exit_area(AreaBullet *p_area) override;
 };
 
 #endif