diff options
| author | nerzhul <loic.blot@unix-experience.fr> | 2016-02-11 15:21:21 +0100 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2016-02-11 16:55:15 +0100 |
| commit | fefa148d694364cb4c60fbb4ffdc0f8ae6388df6 (patch) | |
| tree | 8755fd0d4ef196c23924ae2909a29681f9f77f05 /src/content_sao.cpp | |
| parent | 24b312cc085b7fae6477c8a47fffb57484b20f6e (diff) | |
| download | minetest-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/content_sao.cpp')
| -rw-r--r-- | src/content_sao.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp index fa2454821..53bf3154f 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -259,7 +259,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended) else { if(m_prop.physical){ - core::aabbox3d<f32> box = m_prop.collisionbox; + aabb3f box = m_prop.collisionbox; box.MinEdge *= BS; box.MaxEdge *= BS; collisionMoveResult moveresult; @@ -786,7 +786,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_, m_prop.hp_max = PLAYER_MAX_HP; m_prop.physical = false; m_prop.weight = 75; - m_prop.collisionbox = core::aabbox3d<f32>(-1/3.,-1.0,-1/3., 1/3.,1.0,1/3.); + m_prop.collisionbox = aabb3f(-1/3.,-1.0,-1/3., 1/3.,1.0,1/3.); // start of default appearance, this should be overwritten by LUA m_prop.visual = "upright_sprite"; m_prop.visual_size = v2f(1, 2); |