projects
/
zefram
/
minetest
/
minetest_engine.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5bd9c23
)
Fix merge mistake when rebasing for PR #1169
author
Ciaran Gultnieks
<ciaran@ciarang.com>
Fri, 21 Mar 2014 20:12:13 +0000
(20:12 +0000)
committer
Sfan5
<sfan5@live.de>
Mon, 24 Mar 2014 18:56:36 +0000
(19:56 +0100)
src/environment.cpp
patch
|
blob
|
history
diff --git
a/src/environment.cpp
b/src/environment.cpp
index 4b84257742c34bd7e92e8db911640ff311ed24e3..630f8d21a4fe5ac9f4061b216922ce15a1af2c0d 100644
(file)
--- 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) {