Dungeongen: Fix out-of-voxelmanip access segfault

[minetest.git] / src / camera.cpp

diff --git a/src/camera.cpp b/src/camera.cpp
index 43980db1cc8efcd7684025bb85ff70b40e3530f3..a7679e43adb581eb88832176d0f5f4050041db94 100644 (file)
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -27,12 +27,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "wieldmesh.h"
 #include "noise.h"         // easeCurve
-#include "gamedef.h"
 #include "sound.h"
 #include "event.h"
 #include "profiler.h"
 #include "util/numeric.h"
-#include "util/mathconstants.h"
 #include "constants.h"
 #include "fontengine.h"
 
@@ -41,7 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "nodedef.h"
 
 Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
-               IGameDef *gamedef):
+               Client *client):
        m_playernode(NULL),
        m_headnode(NULL),
        m_cameranode(NULL),
@@ -50,7 +48,7 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
        m_wieldnode(NULL),
 
        m_draw_control(draw_control),
-       m_gamedef(gamedef),
+       m_client(client),
 
        m_camera_position(0,0,0),
        m_camera_direction(0,0,0),
@@ -88,7 +86,7 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
        m_wieldmgr = smgr->createNewSceneManager();
        m_wieldmgr->addCameraSceneNode();
        m_wieldnode = new WieldMeshSceneNode(m_wieldmgr->getRootSceneNode(), m_wieldmgr, -1, false);
-       m_wieldnode->setItem(ItemStack(), m_gamedef);
+       m_wieldnode->setItem(ItemStack(), m_client);
        m_wieldnode->drop(); // m_wieldmgr grabbed it
 
        /* TODO: Add a callback function so these can be updated when a setting
@@ -151,7 +149,7 @@ void Camera::step(f32 dtime)
        m_wield_change_timer = MYMIN(m_wield_change_timer + dtime, 0.125);
 
        if (m_wield_change_timer >= 0 && was_under_zero)
-               m_wieldnode->setItem(m_wield_item_next, m_gamedef);
+               m_wieldnode->setItem(m_wield_item_next, m_client);
 
        if (m_view_bobbing_state != 0)
        {
@@ -189,7 +187,7 @@ void Camera::step(f32 dtime)
                                        (was > 0.5f && m_view_bobbing_anim <= 0.5f));
                        if(step) {
                                MtEvent *e = new SimpleTriggerEvent("ViewBobbingStep");
-                               m_gamedef->event()->put(e);
+                               m_client->event()->put(e);
                        }
                }
        }
@@ -210,10 +208,10 @@ void Camera::step(f32 dtime)
                        if(m_digging_button == 0)
                        {
                                MtEvent *e = new SimpleTriggerEvent("CameraPunchLeft");
-                               m_gamedef->event()->put(e);
+                               m_client->event()->put(e);
                        } else if(m_digging_button == 1) {
                                MtEvent *e = new SimpleTriggerEvent("CameraPunchRight");
-                               m_gamedef->event()->put(e);
+                               m_client->event()->put(e);
                        }
                }
        }
@@ -352,7 +350,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
                                my_cp.Y = m_camera_position.Y + (m_camera_direction.Y*-i);
 
                        // Prevent camera positioned inside nodes
-                       INodeDefManager *nodemgr = m_gamedef->ndef();
+                       INodeDefManager *nodemgr = m_client->ndef();
                        MapNode n = c_env.getClientMap().getNodeNoEx(floatToInt(my_cp, BS));
                        const ContentFeatures& features = nodemgr->get(n);
                        if(features.walkable)
@@ -390,13 +388,12 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
 
        // Get FOV
        f32 fov_degrees;
-       if (player->getPlayerControl().zoom && m_gamedef->checkLocalPrivilege("zoom")) {
+       if (player->getPlayerControl().zoom && m_client->checkLocalPrivilege("zoom")) {
                fov_degrees = m_cache_zoom_fov;
        } else {
                fov_degrees = m_cache_fov;
        }
-       fov_degrees = MYMAX(fov_degrees, 10.0);
-       fov_degrees = MYMIN(fov_degrees, 170.0);
+       fov_degrees = rangelim(fov_degrees, 7.0, 160.0);
 
        // FOV and aspect ratio
        m_aspect = (f32) porting::getWindowSize().X / (f32) porting::getWindowSize().Y;
@@ -468,7 +465,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
        const bool climbing = movement_Y && player->is_climbing;
        if ((walking || swimming || climbing) &&
                        m_cache_view_bobbing &&
-                       (!g_settings->getBool("free_move") || !m_gamedef->checkLocalPrivilege("fly")))
+                       (!g_settings->getBool("free_move") || !m_client->checkLocalPrivilege("fly")))
        {
                // Start animation
                m_view_bobbing_state = 1;