summaryrefslogtreecommitdiff
path: root/servers/physics
diff options
context:
space:
mode:
authorHein-Pieter van Braam <hp@tmm.cx>2017-09-07 21:48:50 +0200
committerHein-Pieter van Braam <hp@tmm.cx>2017-09-08 14:57:48 +0200
commit67a706fc1b9721f3f06eef8be7312f175e2041ce (patch)
treebd0fb17813ac40b1b1e21a1e3a7236b30b7d69bb /servers/physics
parentd1cb73b47a17de830d9474026ffa7b3587cfbc68 (diff)
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.
Diffstat (limited to 'servers/physics')
-rw-r--r--servers/physics/broad_phase_basic.cpp3
1 files changed, 2 insertions, 1 deletions
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++;