diff options
| author | Ciaran Gultnieks <ciaran@ciarang.com> | 2014-03-21 20:12:13 +0000 |
|---|---|---|
| committer | Sfan5 <sfan5@live.de> | 2014-03-24 19:56:36 +0100 |
| commit | 564e11fc2f3731383cecedac8aade4dd9ecdc243 (patch) | |
| tree | fb34f84e7d62f18589b677d52b233ce8d8f6738d /src/environment.cpp | |
| parent | 5bd9c236d563f3c5a6e268abb13f291a915cde1c (diff) | |
| download | minetest-564e11fc2f3731383cecedac8aade4dd9ecdc243.tar.gz minetest-564e11fc2f3731383cecedac8aade4dd9ecdc243.tar.bz2 minetest-564e11fc2f3731383cecedac8aade4dd9ecdc243.zip | |
Fix merge mistake when rebasing for PR #1169
Diffstat (limited to 'src/environment.cpp')
| -rw-r--r-- | src/environment.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/environment.cpp b/src/environment.cpp index 4b8425774..630f8d21a 100644 --- 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) { |