fixed collision filter; updated Room_IsJoined(...) function;

opentomb · Nov 8, 2016 · 7b8956c · 7b8956c
1 parent 53674d1
commit 7b8956c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/physics_bullet.cpp b/src/physics_bullet.cpp
@@ -69,6 +69,10 @@ class bt_engine_ClosestRayResultCallback : public btCollisionWorld::ClosestRayRe
         if(r0 && r1)
         {
             room_sector_p rs = NULL;
+            if(Room_IsOverlapped(r0, r1))
+            {
+                return 1.0f;
+            }
             if((m_cont->object_type == OBJECT_ENTITY) && (m_cont->object))
             {
                 entity_p ent = (entity_p)m_cont->object;
@@ -125,6 +129,10 @@ class bt_engine_ClosestConvexResultCallback : public btCollisionWorld::ClosestCo
         if(r0 && r1)
         {
             room_sector_p rs = NULL;
+            if(Room_IsOverlapped(r0, r1))
+            {
+                return 1.0f;
+            }
             if((m_cont->object_type == OBJECT_ENTITY) && (m_cont->object))
             {
                 entity_p ent = (entity_p)m_cont->object;

diff --git a/src/room.cpp b/src/room.cpp
@@ -449,8 +449,6 @@ void Room_AddToNearRoomsList(struct room_s *room, struct room_s *r)
 
 int Room_IsJoined(struct room_s *r1, struct room_s *r2)
 {
-    r1 = r1->real_room;
-    r2 = r2->real_room;
     portal_p p = r1->portals;
     for(uint16_t i = 0; i < r1->portals_count; i++, p++)
     {