X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcamera.h;h=fc43d1176496d7ea6a3a4b0894fc68331228c0b0;hb=5917e862977518b80cb7a2a4b9dfbeda59c3656b;hp=7be8162b56f14fc8cbd89d1434ce59f9a15f22c5;hpb=365f7a5bfe0cf1838b0c6f3936c4437f3dd9f1f7;p=dragonfireclient.git

diff --git a/src/camera.h b/src/camera.h
index 7be8162b5..fc43d1176 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -20,11 +20,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CAMERA_HEADER
 #define CAMERA_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "inventory.h"
 #include "mesh.h"
 #include "tile.h"
-#include "utility.h"
+#include "util/numeric.h"
 #include <ICameraSceneNode.h>
 
 class LocalPlayer;
@@ -39,7 +39,8 @@ class IGameDef;
 class Camera
 {
 public:
-	Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control);
+	Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
+			IGameDef *gamedef);
 	~Camera();
 
 	// Get player scene node.
@@ -105,7 +106,8 @@ class Camera
 
 	// Update the camera from the local player's position.
 	// frametime is used to adjust the viewing range.
-	void update(LocalPlayer* player, f32 frametime, v2u32 screensize);
+	void update(LocalPlayer* player, f32 frametime, v2u32 screensize,
+			f32 tool_reload_ratio);
 
 	// Render distance feedback loop
 	void updateViewingRange(f32 frametime_in);
@@ -115,7 +117,7 @@ class Camera
 	void setDigging(s32 button);
 
 	// Replace the wielded item mesh
-	void wield(const ItemStack &item, IGameDef *gamedef);
+	void wield(const ItemStack &item);
 
 	// Draw the wielded tool.
 	// This has to happen *after* the main scene is drawn.
@@ -135,6 +137,8 @@ class Camera
 
 	// draw control
 	MapDrawControl& m_draw_control;
+	
+	IGameDef *m_gamedef;
 
 	// Absolute camera position
 	v3f m_camera_position;