Catch SendFailedException when replying back in Connection::Receive()

[oweals/minetest.git] / src / camera.cpp

diff --git a/src/camera.cpp b/src/camera.cpp
index 1a53304970b295885bdf7334451618dc8d91e78a..634a7cc9f7f63eb5ab3023e454a11a9ca1e071ba 100644 (file)
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -25,6 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "player.h"
 #include "tile.h"
 #include <cmath>
+#include <SAnimatedMesh.h>
+#include "settings.h"
 
 Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control):
        m_smgr(smgr),
@@ -208,7 +210,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
                #if 1
                f32 bobknob = 1.2;
                f32 bobtmp = sin(pow(bobfrac, bobknob) * PI);
-               f32 bobtmp2 = cos(pow(bobfrac, bobknob) * PI);
+               //f32 bobtmp2 = cos(pow(bobfrac, bobknob) * PI);
 
                v3f bobvec = v3f(
                        0.3 * bobdir * sin(bobfrac * PI),
@@ -219,6 +221,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
                //rel_cam_target += 0.03 * bobvec;
                //rel_cam_up.rotateXYBy(0.02 * bobdir * bobtmp * PI);
                float f = 1.0;
+               f *= g_settings->getFloat("view_bobbing_amount");
                rel_cam_pos += bobvec * f;
                //rel_cam_target += 0.995 * bobvec * f;
                rel_cam_target += bobvec * f;
@@ -265,7 +268,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
 
        // Position the wielded item
        v3f wield_position = v3f(45, -35, 65);
-       v3f wield_rotation = v3f(90, -90, -90);
+       v3f wield_rotation = v3f(-100, 110, -100);
        if (m_digging_button != -1)
        {
                f32 digfrac = m_digging_anim;
@@ -299,8 +302,8 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
        v3f speed = player->getSpeed();
        if ((hypot(speed.X, speed.Z) > BS) &&
                (player->touching_ground) &&
-               (g_settings.getBool("view_bobbing") == true) &&
-               (g_settings.getBool("free_move") == false))
+               (g_settings->getBool("view_bobbing") == true) &&
+               (g_settings->getBool("free_move") == false))
        {
                // Start animation
                m_view_bobbing_state = 1;
@@ -427,18 +430,18 @@ void Camera::updateViewingRange(f32 frametime_in)
 
 void Camera::updateSettings()
 {
-       m_viewing_range_min = g_settings.getS16("viewing_range_nodes_min");
+       m_viewing_range_min = g_settings->getS16("viewing_range_nodes_min");
        m_viewing_range_min = MYMAX(5.0, m_viewing_range_min);
 
-       m_viewing_range_max = g_settings.getS16("viewing_range_nodes_max");
+       m_viewing_range_max = g_settings->getS16("viewing_range_nodes_max");
        m_viewing_range_max = MYMAX(m_viewing_range_min, m_viewing_range_max);
 
-       f32 fov_degrees = g_settings.getFloat("fov");
+       f32 fov_degrees = g_settings->getFloat("fov");
        fov_degrees = MYMAX(fov_degrees, 10.0);
        fov_degrees = MYMIN(fov_degrees, 170.0);
        m_fov_y = fov_degrees * PI / 180.0;
 
-       f32 wanted_fps = g_settings.getFloat("wanted_fps");
+       f32 wanted_fps = g_settings->getFloat("wanted_fps");
        wanted_fps = MYMAX(wanted_fps, 1.0);
        m_wanted_frametime = 1.0 / wanted_fps;
 }