Disable word wrap in vertical texts in main menu

[minetest.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 1c9dde7e0aab7c369f58164a74f71577de08f048..d62fb611116bfddae84bd69736d68fd0833bceeb 100644 (file)
--- 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;
+struct CollisionInfo;
 
 class Player
 {
@@ -117,16 +117,7 @@ class Player
                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;
        }
@@ -164,8 +155,6 @@ class Player
        // Actual inventory is backed up here when creative mode is used
        Inventory *inventory_backup;
 
-       bool craftresult_is_preview;
-
        u16 hp;
 
        u16 peer_id;
@@ -174,7 +163,6 @@ class Player
        IGameDef *m_gamedef;
 
        char m_name[PLAYERNAME_SIZE];
-       u16 m_selected_item;
        f32 m_pitch;
        f32 m_yaw;
        v3f m_speed;