From 02726f00031c8ffadf5298b037b595372be202ef Mon Sep 17 00:00:00 2001
From: Kahrl <kahrl@gmx.net>
Date: Mon, 19 Sep 2011 06:37:24 +0200
Subject: Convert any inventory item into a mesh, bring back
 InventoryItem::getImageRay(), some const-correctness fixes

---
 src/camera.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/camera.h')

diff --git a/src/camera.h b/src/camera.h
index 08c03dd19..ccc224e3c 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "common_irrlicht.h"
 #include "inventory.h"
+#include "tile.h"
 #include "utility.h"
 
 class LocalPlayer;
@@ -117,7 +118,7 @@ public:
 	void updateSettings();
 
 	// Replace the wielded item mesh
-	void wield(InventoryItem* item);
+	void wield(const InventoryItem* item);
 
 	// Start or stop digging animation
 	void setDigging(bool digging);
@@ -190,7 +191,7 @@ public:
 	~ExtrudedSpriteSceneNode();
 
 	void setSprite(video::ITexture* texture);
-	void setCube(const TileSpec faces[6]);
+	void setCube(const TileSpec tiles[6]);
 
 	f32 getSpriteThickness() const { return m_thickness; }
 	void setSpriteThickness(f32 thickness);
-- 
cgit v1.2.3