From 67a706fc1b9721f3f06eef8be7312f175e2041ce Mon Sep 17 00:00:00 2001 From: Hein-Pieter van Braam Date: Thu, 7 Sep 2017 21:48:50 +0200 Subject: Fix various assorted warnings Fix various warnings that don't have enough instances to merit individual commits. Also fixes a potential bug in audio_server.cpp. --- servers/physics/broad_phase_basic.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'servers/physics/broad_phase_basic.cpp') diff --git a/servers/physics/broad_phase_basic.cpp b/servers/physics/broad_phase_basic.cpp index 959718a252..c6565ac2e9 100644 --- a/servers/physics/broad_phase_basic.cpp +++ b/servers/physics/broad_phase_basic.cpp @@ -30,9 +30,10 @@ #include "broad_phase_basic.h" #include "list.h" #include "print_string.h" + BroadPhaseSW::ID BroadPhaseBasic::create(CollisionObjectSW *p_object, int p_subindex) { - ERR_FAIL_COND_V(p_object == NULL, NULL); + ERR_FAIL_COND_V(p_object == NULL, 0); current++; -- cgit v1.2.3