Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge mistake when rebasing for PR #1169

This commit is contained in:
Ciaran Gultnieks 2014-03-21 20:12:13 +00:00 committed by Sfan5
parent 5bd9c236d5
commit 564e11fc2f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/environment.cpp
View File

@ -795,8 +795,7 @@ neighbor_found:
// Call all the trigger variations // Call all the trigger variations
i->abm->trigger(m_env, p, n); i->abm->trigger(m_env, p, n);
i->abm->trigger(m_env, p, n, i->abm->trigger(m_env, p, n,
active_object_count, active_object_count, active_object_count_wider);
active_object_count_wider + active_object_count);
// Count surrounding objects again if the abms added any // Count surrounding objects again if the abms added any
if(m_env->m_added_objects > 0) { if(m_env->m_added_objects > 0) {