summaryrefslogtreecommitdiff
path: root/servers/physics
diff options
context:
space:
mode:
authorqarmin <mikrutrafal54@gmail.com>2019-08-07 12:54:30 +0200
committerqarmin <mikrutrafal54@gmail.com>2019-08-07 12:54:30 +0200
commite0b5b218638df5b7b2998233182a7d8a1118e717 (patch)
tree0de2f04fbb41472d3bd9b43141f26193cb062be9 /servers/physics
parent045ab51ae50139e645958149c6d6d354026ccdd4 (diff)
Add some code changes/fixes proposed by Coverity and Clang Tidy
Diffstat (limited to 'servers/physics')
-rw-r--r--servers/physics/space_sw.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/servers/physics/space_sw.cpp b/servers/physics/space_sw.cpp
index f3a4cbed24..410b6e59a0 100644
--- a/servers/physics/space_sw.cpp
+++ b/servers/physics/space_sw.cpp
@@ -348,11 +348,9 @@ bool PhysicsDirectSpaceStateSW::collide_shape(RID p_shape, const Transform &p_sh
cbk.max = p_result_max;
cbk.amount = 0;
cbk.ptr = r_results;
- CollisionSolverSW::CallbackResult cbkres = NULL;
+ CollisionSolverSW::CallbackResult cbkres = PhysicsServerSW::_shape_col_cbk;
- PhysicsServerSW::CollCbkData *cbkptr = NULL;
- cbkptr = &cbk;
- cbkres = PhysicsServerSW::_shape_col_cbk;
+ PhysicsServerSW::CollCbkData *cbkptr = &cbk;
for (int i = 0; i < amount; i++) {