X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcamera.h;h=006f4b3cebadf1a74f9e682d2e1ed74b9bd54198;hb=c26eb87aec7438d167fa2f460a3f412db09c0ac5;hp=996be79b27e8a054911fa3470b28f880cb6b5ce5;hpb=9b551d5cbcaf71a8c39bbf7e886290649aed4799;p=oweals%2Fminetest.git

diff --git a/src/camera.h b/src/camera.h
index 996be79b2..006f4b3ce 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_extrabloated.h"
 #include "inventory.h"
 #include "mesh.h"
-#include "tile.h"
+#include "client/tile.h"
 #include "util/numeric.h"
 #include <ICameraSceneNode.h>
 
@@ -110,7 +110,7 @@ public:
 	}
 
 	// Checks if the constructor was able to create the scene nodes
-	bool successfullyCreated(std::wstring& error_message);
+	bool successfullyCreated(std::string &error_message);
 
 	// Step the camera: updates the viewing range and view bobbing.
 	void step(f32 dtime);
@@ -159,7 +159,6 @@ private:
 
 	scene::ISceneManager* m_wieldmgr;
 	WieldMeshSceneNode* m_wieldnode;
-	scene::ILightSceneNode* m_wieldlightnode;
 
 	// draw control
 	MapDrawControl& m_draw_control;
@@ -209,6 +208,12 @@ private:
 	ItemStack m_wield_item_next;
 
 	CameraMode m_camera_mode;
+
+	f32 m_cache_fall_bobbing_amount;
+	f32 m_cache_view_bobbing_amount;
+	f32 m_cache_wanted_fps;
+	f32 m_cache_fov;
+	bool m_cache_view_bobbing;
 };
 
 #endif