diff options
| author | Kemikal1 <alex_goku2007@yahoo.com> | 2021-10-19 16:40:07 +0300 |
|---|---|---|
| committer | Kemikal1 <alex_goku2007@yahoo.com> | 2021-10-21 15:02:28 +0300 |
| commit | 563d3dbf9408c03ff89056d03616c28c1e2c586f (patch) | |
| tree | 1b1d8087b4b0c73c7729e5d76f0da6bcc267fb55 /scene | |
| parent | 9c9ec63e1dbd33cace4a988783f1130b4c3f06ad (diff) | |
Change the unreacheable return value of shape_find_owner()
Update collision_object_3d.cpp
2d modified and UINT32 usage
Proper uINT32max usage
Change the unreacheable return value of shape_find_owner()
This reverts commit 5be98b81428169ba2dd5baecd00f1adfd9260e5c, reversing
changes made to efa3ff6b9587d674cd448aca32abfd31b2c7f4d3.
Change the unreacheable return value of shape_find_owner()
changed from 0 to uint32_max"
This reverts commit c143bb099af2666454f82428a57f2721af60a84d.
Revert "changed from 0 to uint32_max""
This reverts commit 59e94edb9a32edff15f3cb881e6fc394d2aa7f65.
Revert "changed from 0 to uint32_max"
This reverts commit c143bb099af2666454f82428a57f2721af60a84d.
Revert "Revert "changed from 0 to uint32_max"""
This reverts commit c81d1073ec21b4cde4684a6dbd595f3359283bad.
Revert "changed from 0 to uint32_max"
This reverts commit c143bb099af2666454f82428a57f2721af60a84d.
Revert "changed from 0 to uint32_max""
This reverts commit 59e94edb9a32edff15f3cb881e6fc394d2aa7f65.
Revert "Revert "changed from 0 to uint32_max"""
This reverts commit 6dbd972aa5c4580d4f6270ead6c66eea18617f29.
Revert "changed from 0 to uint32_max""
This reverts commit 59e94edb9a32edff15f3cb881e6fc394d2aa7f65.
Revert "Revert "changed from 0 to uint32_max"""
This reverts commit b769ac2d11ad12f02a388d9dad17519f81d9c3b6.
Revert "Revert "Revert "changed from 0 to uint32_max""""
This reverts commit 1e8d84f7ec12da01c3153e08bb8609cf2c6fd58a.
Revert "Revert "Revert "Revert "changed from 0 to uint32_max"""""
This reverts commit 0dc17abefad6d540c18bba7b4df9d8c04e090d0c.
Change the unreacheable return value of shape_find_owner()
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/2d/collision_object_2d.cpp | 4 | ||||
| -rw-r--r-- | scene/3d/collision_object_3d.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scene/2d/collision_object_2d.cpp b/scene/2d/collision_object_2d.cpp index 6916f832d0..28facd09ce 100644 --- a/scene/2d/collision_object_2d.cpp +++ b/scene/2d/collision_object_2d.cpp @@ -454,7 +454,7 @@ void CollisionObject2D::shape_owner_clear_shapes(uint32_t p_owner) { } uint32_t CollisionObject2D::shape_find_owner(int p_shape_index) const { - ERR_FAIL_INDEX_V(p_shape_index, total_subshapes, 0); + ERR_FAIL_INDEX_V(p_shape_index, total_subshapes, UINT32_MAX); for (const KeyValue<uint32_t, ShapeData> &E : shapes) { for (int i = 0; i < E.value.shapes.size(); i++) { @@ -465,7 +465,7 @@ uint32_t CollisionObject2D::shape_find_owner(int p_shape_index) const { } //in theory it should be unreachable - return 0; + ERR_FAIL_V_MSG(UINT32_MAX, "Can't find owner for shape index " + itos(p_shape_index) + "."); } void CollisionObject2D::set_pickable(bool p_enabled) { diff --git a/scene/3d/collision_object_3d.cpp b/scene/3d/collision_object_3d.cpp index 814ed5c2a7..fd891a5e13 100644 --- a/scene/3d/collision_object_3d.cpp +++ b/scene/3d/collision_object_3d.cpp @@ -648,7 +648,7 @@ void CollisionObject3D::shape_owner_clear_shapes(uint32_t p_owner) { } uint32_t CollisionObject3D::shape_find_owner(int p_shape_index) const { - ERR_FAIL_INDEX_V(p_shape_index, total_subshapes, 0); + ERR_FAIL_INDEX_V(p_shape_index, total_subshapes, UINT32_MAX); for (const KeyValue<uint32_t, ShapeData> &E : shapes) { for (int i = 0; i < E.value.shapes.size(); i++) { @@ -659,7 +659,7 @@ uint32_t CollisionObject3D::shape_find_owner(int p_shape_index) const { } //in theory it should be unreachable - return 0; + ERR_FAIL_V_MSG(UINT32_MAX, "Can't find owner for shape index " + itos(p_shape_index) + "."); } CollisionObject3D::CollisionObject3D(RID p_rid, bool p_area) { |