Fix merge mistake when rebasing for PR #1169

2014-03-21 20:12:13 +00:00 · 2014-03-21 20:12:13 +00:00 · 564e11fc2f
parent 5bd9c236d5
commit 564e11fc2f
1 changed files with 1 additions and 2 deletions
--- a/src/environment.cpp
+++ b/src/environment.cpp
@ -795,8 +795,7 @@ neighbor_found:
 				// 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) {