summaryrefslogtreecommitdiff
path: root/src/player.h
diff options
context:
space:
mode:
authornerzhul <loic.blot@unix-experience.fr>2016-02-11 15:21:21 +0100
committerest31 <MTest31@outlook.com>2016-02-11 16:55:15 +0100
commitfefa148d694364cb4c60fbb4ffdc0f8ae6388df6 (patch)
tree8755fd0d4ef196c23924ae2909a29681f9f77f05 /src/player.h
parent24b312cc085b7fae6477c8a47fffb57484b20f6e (diff)
downloadminetest-fefa148d694364cb4c60fbb4ffdc0f8ae6388df6.tar.gz
minetest-fefa148d694364cb4c60fbb4ffdc0f8ae6388df6.tar.bz2
minetest-fefa148d694364cb4c60fbb4ffdc0f8ae6388df6.zip
v2d & aabbox3d<f32> & sky cleanups
* Sky: rename Box => m_box and inline getBoundingBox * Uniformize aabbox3d<f32> to aabb3f
Diffstat (limited to 'src/player.h')
-rw-r--r--src/player.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/player.h b/src/player.h
index 48b0a4999..0d99297ca 100644
--- a/src/player.h
+++ b/src/player.h
@@ -198,7 +198,7 @@ public:
return m_name;
}
- core::aabbox3d<f32> getCollisionbox()
+ aabb3f getCollisionbox()
{
return m_collisionbox;
}
@@ -398,7 +398,7 @@ protected:
f32 m_yaw;
v3f m_speed;
v3f m_position;
- core::aabbox3d<f32> m_collisionbox;
+ aabb3f m_collisionbox;
bool m_dirty;