diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-11-06 11:02:40 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-11-06 11:02:40 -0300 |
| commit | fc676fa6f8de6b0b24cf54ecfa3f9221c607095c (patch) | |
| tree | 61f54bf6c962b21c9047b26cc740e684db967d25 /servers/physics_2d | |
| parent | 0dbedd18fc62f700e92a4cf581e505d849bc47ad (diff) | |
missing files with fixes for shower of bullets
Diffstat (limited to 'servers/physics_2d')
| -rw-r--r-- | servers/physics_2d/space_2d_sw.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics_2d/space_2d_sw.cpp b/servers/physics_2d/space_2d_sw.cpp index 8b72436936..b642242d02 100644 --- a/servers/physics_2d/space_2d_sw.cpp +++ b/servers/physics_2d/space_2d_sw.cpp @@ -437,6 +437,7 @@ Physics2DDirectSpaceStateSW::Physics2DDirectSpaceStateSW() { void* Space2DSW::_broadphase_pair(CollisionObject2DSW *A,int p_subindex_A,CollisionObject2DSW *B,int p_subindex_B,void *p_self) { + CollisionObject2DSW::Type type_A=A->get_type(); CollisionObject2DSW::Type type_B=B->get_type(); if (type_A>type_B) { @@ -451,7 +452,6 @@ void* Space2DSW::_broadphase_pair(CollisionObject2DSW *A,int p_subindex_A,Collis if (type_A==CollisionObject2DSW::TYPE_AREA) { - ERR_FAIL_COND_V(type_B!=CollisionObject2DSW::TYPE_BODY,NULL); Area2DSW *area=static_cast<Area2DSW*>(A); Body2DSW *body=static_cast<Body2DSW*>(B); |