Merge pull request #38 from igorribeiroduarte/master

Disabling collision for inactive objects
fgagamedev · Jun 17, 2016 · c406dc9 · c406dc9
2 parents 396cf50 + c1ca9b4
commit c406dc9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/engine.cpp b/src/engine.cpp
@@ -352,7 +352,7 @@ namespace ijengine
             case ONE_TO_ALL:
                 for (auto obj : objects)
                 {
-                    if (obj == target or not target->active())
+                    if (obj == target or not target->active() or not obj->active())
                         continue;
 
                     auto r = collision(target, obj);