summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/lua_api.txt4
-rw-r--r--src/script/common/c_content.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 1ffb5c39b..b1099ec59 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -6632,8 +6632,8 @@ Collision info passed to `on_step`:
type = string, -- "node" or "object",
axis = string, -- "x", "y" or "z"
node_pos = vector, -- if type is "node"
- old_speed = vector,
- new_speed = vector,
+ old_velocity = vector,
+ new_velocity = vector,
},
...
}
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 6ff642738..95364000c 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -2046,10 +2046,10 @@ void push_collision_move_result(lua_State *L, const collisionMoveResult &res)
}
push_v3f(L, c.old_speed / BS);
- lua_setfield(L, -2, "old_speed");
+ lua_setfield(L, -2, "old_velocity");
push_v3f(L, c.new_speed / BS);
- lua_setfield(L, -2, "new_speed");
+ lua_setfield(L, -2, "new_velocity");
lua_rawseti(L, -2, i++);
}