Skip to content
Permalink
Browse files

Fix merge mistake when rebasing for PR #1169

  • Loading branch information
CiaranG authored and sfan5 committed Mar 24, 2014
1 parent 5bd9c23 commit 564e11fc2f3731383cecedac8aade4dd9ecdc243
Showing with 1 addition and 2 deletions.
  1. +1 −2 src/environment.cpp
@@ -795,8 +795,7 @@ class ABMHandler
// Call all the trigger variations
i->abm->trigger(m_env, p, n);
i->abm->trigger(m_env, p, n,
active_object_count,
active_object_count_wider + active_object_count);
active_object_count, active_object_count_wider);

// Count surrounding objects again if the abms added any
if(m_env->m_added_objects > 0) {

0 comments on commit 564e11f

Please sign in to comment.