summaryrefslogtreecommitdiff
path: root/src/content_sao.cpp
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2013-04-17 00:15:53 +0200
committerPilzAdam <pilzadam@minetest.net>2013-04-25 18:53:50 +0200
commit88ffb3f73bb16c6680ee10a8e804a699e366edd8 (patch)
tree991091a87b4e588c847f14fea7d181560667caa5 /src/content_sao.cpp
parent386108f982e3d0819f6a153d750f967c0b25268c (diff)
downloadminetest-88ffb3f73bb16c6680ee10a8e804a699e366edd8.tar.gz
minetest-88ffb3f73bb16c6680ee10a8e804a699e366edd8.tar.bz2
minetest-88ffb3f73bb16c6680ee10a8e804a699e366edd8.zip
Move player collisionbox to player class
Diffstat (limited to 'src/content_sao.cpp')
-rw-r--r--src/content_sao.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 3526ecbd2..24a9186f7 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -1472,6 +1472,11 @@ std::string PlayerSAO::getPropertyPacket()
}
bool PlayerSAO::getCollisionBox(aabb3f *toset) {
- //player collision handling is already done clientside no need to do it twice
- return false;
+ //update collision box
+ *toset = m_player->getCollisionbox();
+
+ toset->MinEdge += m_base_position;
+ toset->MaxEdge += m_base_position;
+
+ return true;
}