1 files changed, 11 insertions, 21 deletions

diff --git a/servers/physics_2d/shape_2d_sw.cpp b/servers/physics_2d/shape_2d_sw.cpp
index 064c4afe52..bde882ac24 100644
--- a/servers/physics_2d/shape_2d_sw.cpp
+++ b/servers/physics_2d/shape_2d_sw.cpp
@@ -36,8 +36,8 @@
 void Shape2DSW::configure(const Rect2 &p_aabb) {
 	aabb = p_aabb;
 	configured = true;
-	for (Map<ShapeOwner2DSW *, int>::Element *E = owners.front(); E; E = E->next()) {
-		ShapeOwner2DSW *co = (ShapeOwner2DSW *)E->key();
+	for (const KeyValue<ShapeOwner2DSW *, int> &E : owners) {
+		ShapeOwner2DSW *co = (ShapeOwner2DSW *)E.key;
 		co->_shape_changed();
 	}
 }
@@ -75,11 +75,6 @@ const Map<ShapeOwner2DSW *, int> &Shape2DSW::get_owners() const {
 	return owners;
 }
 
-Shape2DSW::Shape2DSW() {
-	custom_bias = 0;
-	configured = false;
-}
-
 Shape2DSW::~Shape2DSW() {
 	ERR_FAIL_COND(owners.size());
 }
@@ -88,15 +83,15 @@ Shape2DSW::~Shape2DSW() {
 /*********************************************************/
 /*********************************************************/
 
-void WorldMarginShape2DSW::get_supports(const Vector2 &p_normal, Vector2 *r_supports, int &r_amount) const {
+void WorldBoundaryShape2DSW::get_supports(const Vector2 &p_normal, Vector2 *r_supports, int &r_amount) const {
 	r_amount = 0;
 }
 
-bool WorldMarginShape2DSW::contains_point(const Vector2 &p_point) const {
+bool WorldBoundaryShape2DSW::contains_point(const Vector2 &p_point) const {
 	return normal.dot(p_point) < d;
 }
 
-bool WorldMarginShape2DSW::intersect_segment(const Vector2 &p_begin, const Vector2 &p_end, Vector2 &r_point, Vector2 &r_normal) const {
+bool WorldBoundaryShape2DSW::intersect_segment(const Vector2 &p_begin, const Vector2 &p_end, Vector2 &r_point, Vector2 &r_normal) const {
 	Vector2 segment = p_begin - p_end;
 	real_t den = normal.dot(segment);
 
@@ -118,11 +113,11 @@ bool WorldMarginShape2DSW::intersect_segment(const Vector2 &p_begin, const Vecto
 	return true;
 }
 
-real_t WorldMarginShape2DSW::get_moment_of_inertia(real_t p_mass, const Size2 &p_scale) const {
+real_t WorldBoundaryShape2DSW::get_moment_of_inertia(real_t p_mass, const Size2 &p_scale) const {
 	return 0;
 }
 
-void WorldMarginShape2DSW::set_data(const Variant &p_data) {
+void WorldBoundaryShape2DSW::set_data(const Variant &p_data) {
 	ERR_FAIL_COND(p_data.get_type() != Variant::ARRAY);
 	Array arr = p_data;
 	ERR_FAIL_COND(arr.size() != 2);
@@ -131,7 +126,7 @@ void WorldMarginShape2DSW::set_data(const Variant &p_data) {
 	configure(Rect2(Vector2(-1e4, -1e4), Vector2(1e4 * 2, 1e4 * 2)));
 }
 
-Variant WorldMarginShape2DSW::get_data() const {
+Variant WorldBoundaryShape2DSW::get_data() const {
 	Array arr;
 	arr.resize(2);
 	arr[0] = normal;
@@ -652,11 +647,6 @@ Variant ConvexPolygonShape2DSW::get_data() const {
 	return dvr;
 }
 
-ConvexPolygonShape2DSW::ConvexPolygonShape2DSW() {
-	points = nullptr;
-	point_count = 0;
-}
-
 ConvexPolygonShape2DSW::~ConvexPolygonShape2DSW() {
 	if (points) {
 		memdelete_arr(points);
@@ -885,9 +875,9 @@ void ConcavePolygonShape2DSW::set_data(const Variant &p_data) {
 
 		points.resize(pointmap.size());
 		aabb.position = pointmap.front()->key();
-		for (Map<Point2, int>::Element *E = pointmap.front(); E; E = E->next()) {
-			aabb.expand_to(E->key());
-			points.write[E->get()] = E->key();
+		for (const KeyValue<Point2, int> &E : pointmap) {
+			aabb.expand_to(E.key);
+			points.write[E.value] = E.key;
 		}
 
 		Vector<BVH> main_vbh;