diff options
author | paramat <paramat@users.noreply.github.com> | 2017-11-20 01:45:57 +0000 |
---|---|---|
committer | paramat <mat.gregory@virginmedia.com> | 2017-12-04 02:25:10 +0000 |
commit | f470cb7270560a26afff0a0eadfc69070236c109 (patch) | |
tree | 045b3cac767dfae7fffc02258d02cbaf7978a96f /src/content_sao.cpp | |
parent | 2507d32afe05c73bb27ed221c2a592b0894fdc68 (diff) | |
download | minetest-f470cb7270560a26afff0a0eadfc69070236c109.tar.gz minetest-f470cb7270560a26afff0a0eadfc69070236c109.tar.bz2 minetest-f470cb7270560a26afff0a0eadfc69070236c109.zip |
Zoom: Set zoom FOV per-player using a player object property
Remove player object property 'can zoom'.
Add player object property 'zoom fov'.
Remove clientside setting for 'zoom fov'.
Object property default is 15 degrees in creative mode, zoom disabled
in survival mode.
Needed due to zoom now loading and/or generating distant world
according to zoom FOV.
Update object properties serialisation version to 3.
Diffstat (limited to 'src/content_sao.cpp')
-rw-r--r-- | src/content_sao.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 61384493a..1fb74263b 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "server.h" #include "scripting_server.h" #include "genericobject.h" +#include "settings.h" #include <algorithm> std::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types; @@ -801,7 +802,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, session_t p m_prop.collisionbox = aabb3f(-0.3f, 0.0f, -0.3f, 0.3f, 1.77f, 0.3f); m_prop.selectionbox = aabb3f(-0.3f, 0.0f, -0.3f, 0.3f, 1.77f, 0.3f); m_prop.pointable = true; - // start of default appearance, this should be overwritten by LUA + // Start of default appearance, this should be overwritten by Lua m_prop.visual = "upright_sprite"; m_prop.visual_size = v2f(1, 2); m_prop.textures.clear(); @@ -811,13 +812,14 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, session_t p m_prop.colors.emplace_back(255, 255, 255, 255); m_prop.spritediv = v2s16(1,1); m_prop.eye_height = 1.625f; - // end of default appearance + // End of default appearance m_prop.is_visible = true; m_prop.makes_footstep_sound = true; m_prop.stepheight = PLAYER_DEFAULT_STEPHEIGHT * BS; - m_prop.can_zoom = true; m_hp = m_prop.hp_max; m_breath = m_prop.breath_max; + // Disable zoom in survival mode using a value of 0 + m_prop.zoom_fov = g_settings->getBool("creative_mode") ? 15.0f : 0.0f; } PlayerSAO::~PlayerSAO() |