asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Change the unreacheable return value of shape_find_owner()

Browse source 
(cherry picked from commit 563d3dbf94)
This commit is contained in:
Kemikal1 2021-10-19 16:40:07 +03:00 committed by Rémi Verschelde
parent f0dabe4ac5
commit fa2feb9bec
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/2d/collision_object_2d.cpp
View file

@ -352,7 +352,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 Map<uint32_t, ShapeData>::Element *E = shapes.front(); E; E = E->next()) {
for (int i = 0; i < E->get().shapes.size(); i++) {
@ -363,7 +363,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) {

4
scene/3d/collision_object.cpp
View file

@ -525,7 +525,7 @@ void CollisionObject::shape_owner_clear_shapes(uint32_t p_owner) {
}
uint32_t CollisionObject::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 Map<uint32_t, ShapeData>::Element *E = shapes.front(); E; E = E->next()) {
for (int i = 0; i < E->get().shapes.size(); i++) {
@ -536,7 +536,7 @@ uint32_t CollisionObject::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) + ".");
}
CollisionObject::CollisionObject(RID p_rid, bool p_area) {