summaryrefslogtreecommitdiff
path: root/src/content_cao.cpp
diff options
context:
space:
mode:
authorTeTpaAka <TeTpaAka@users.noreply.github.com>2015-05-29 20:30:55 +0200
committerparamat <mat.gregory@virginmedia.com>2017-07-21 02:03:22 +0100
commit49920cfe8dc7869bb8235c6fe2b8ef26e2a523ca (patch)
tree4ef6f620933a5af6e845bf5cb2a4c448331bb5b1 /src/content_cao.cpp
parent5045bdc6d81445ecf600ff9c268886cada935a7f (diff)
downloadminetest-49920cfe8dc7869bb8235c6fe2b8ef26e2a523ca.tar.gz
minetest-49920cfe8dc7869bb8235c6fe2b8ef26e2a523ca.tar.bz2
minetest-49920cfe8dc7869bb8235c6fe2b8ef26e2a523ca.zip
Player collisionbox: Make settable
Breaks compatibility with old clients.
Diffstat (limited to 'src/content_cao.cpp')
-rw-r--r--src/content_cao.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 49c2049eb..2cc675573 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -972,7 +972,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
if (m_is_visible) {
int old_anim = player->last_animation;
float old_anim_speed = player->last_animation_speed;
- m_position = player->getPosition() + v3f(0,BS,0);
+ m_position = player->getPosition();
m_velocity = v3f(0,0,0);
m_acceleration = v3f(0,0,0);
pos_translator.vect_show = m_position;
@@ -1512,6 +1512,7 @@ void GenericCAO::processMessage(const std::string &data)
if (m_is_local_player) {
LocalPlayer *player = m_env->getLocalPlayer();
player->makes_footstep_sound = m_prop.makes_footstep_sound;
+ player->setCollisionbox(m_selection_box);
}
if ((m_is_player && !m_is_local_player) && m_prop.nametag == "")