scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-12 02:01:29 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

Sync with trunk

Browse Source
This commit is contained in:
karajorma committed 2010-02-19 04:44:25 +00:00
1 parent e6f640c53d
commit 45305bf78f
161 files changed
+13006 -5260
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/object/objcollide.cpp
+8
View File
@@ -136,6 +136,14 @@ int reject_obj_pair_on_parent(object *A, object *B)
return 0;
}
int reject_due_collision_groups(object *A, object *B)
{
if(A->collision_group_id != 0) {
if(A->collision_group_id & B->collision_group_id)
return 1;
}
return 0;
}
// Adds the pair to the pair list
void obj_add_pair( object *A, object *B, int check_time, int add_to_end )