Add cancel button to password change menu. (#5720)

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

diff --git a/src/camera.h b/src/camera.h
index cb0e9686dd7a94aaf93ac11298c8cacdf1967bf9..ca2e4ddcc924a04c1e0adf25e1ca9010ff487c2f 100644 (file)
--- a/src/camera.h
+++ b/src/camera.h
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 class LocalPlayer;
 struct MapDrawControl;
-class IGameDef;
+class Client;
 class WieldMeshSceneNode;
 
 struct Nametag {
@@ -61,7 +61,7 @@ class Camera
 {
 public:
        Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
-                       IGameDef *gamedef);
+                       Client *client);
        ~Camera();
 
        // Get player scene node.
@@ -160,7 +160,13 @@ public:
                else
                        m_camera_mode = CAMERA_MODE_FIRST;
        }
-
+       
+       // Set the current camera mode
+       inline void setCameraMode(CameraMode mode)
+       {
+               m_camera_mode = mode;
+       }
+       
        //read the current camera mode
        inline CameraMode getCameraMode()
        {
@@ -172,8 +178,7 @@ public:
 
        void removeNametag(Nametag *nametag);
 
-       std::list<Nametag *> *getNametags()
-       { return &m_nametags; }
+       const std::list<Nametag *> &getNametags() { return m_nametags; }
 
        void drawNametags();
 
@@ -189,7 +194,7 @@ private:
        // draw control
        MapDrawControl& m_draw_control;
 
-       IGameDef *m_gamedef;
+       Client *m_client;
        video::IVideoDriver *m_driver;
 
        // Absolute camera position
@@ -232,7 +237,6 @@ private:
        f32 m_cache_view_bobbing_amount;
        f32 m_cache_fov;
        f32 m_cache_zoom_fov;
-       bool m_cache_view_bobbing;
 
        std::list<Nametag *> m_nametags;
 };