diff options
| author | Kahrl <kahrl@gmx.net> | 2012-01-12 06:10:39 +0100 |
|---|---|---|
| committer | Kahrl <kahrl@gmx.net> | 2012-01-12 06:10:39 +0100 |
| commit | 6a76c226e10e92c3e3339096f07f8ab065e2098b (patch) | |
| tree | 396d9083f5f76ebb5ba96df113ba68046c2487df /src/player.h | |
| parent | 569156b01302ea4ba45d11ff5524b62dbc6a9aa0 (diff) | |
| download | minetest-6a76c226e10e92c3e3339096f07f8ab065e2098b.tar.gz minetest-6a76c226e10e92c3e3339096f07f8ab065e2098b.tar.bz2 minetest-6a76c226e10e92c3e3339096f07f8ab065e2098b.zip | |
The huge item definition and item namespace unification patch (itemdef), see http://c55.me/minetest/wiki/doku.php?id=changes:itemdef
Diffstat (limited to 'src/player.h')
| -rw-r--r-- | src/player.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/player.h b/src/player.h index 1c9dde7e0..43f6ee5ec 100644 --- a/src/player.h +++ b/src/player.h @@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common_irrlicht.h" #include "inventory.h" -#include "collision.h" #define PLAYERNAME_SIZE 20 @@ -31,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc., class Map; class IGameDef; +class CollisionInfo; class Player { @@ -117,16 +117,7 @@ public: snprintf(m_name, PLAYERNAME_SIZE, "%s", name); } - virtual void wieldItem(u16 item); - virtual const InventoryItem *getWieldItem() const - { - const InventoryList *list = inventory.getList("main"); - if (list) - return list->getItem(m_selected_item); - return NULL; - } - - const char * getName() + const char * getName() const { return m_name; } @@ -174,7 +165,6 @@ protected: IGameDef *m_gamedef; char m_name[PLAYERNAME_SIZE]; - u16 m_selected_item; f32 m_pitch; f32 m_yaw; v3f m_speed; |