Don't try to craft a non-existent item

[dragonfireclient.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 6ac5dfe65ba4e53ef38929b9d46915ab346a2deb..e343f55a5432fa698b127d6ba00b9f18523c1646 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -17,14 +17,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef PLAYER_HEADER
-#define PLAYER_HEADER
+#pragma once
 
 #include "irrlichttypes_bloated.h"
 #include "inventory.h"
-#include "constants.h" // BS
-#include "threading/mutex.h"
+#include "constants.h"
+#include "network/networkprotocol.h"
+#include "util/basic_macros.h"
 #include <list>
+#include <mutex>
 
 #define PLAYERNAME_SIZE 20
 
@@ -33,22 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 struct PlayerControl
 {
-       PlayerControl()
-       {
-               up = false;
-               down = false;
-               left = false;
-               right = false;
-               jump = false;
-               aux1 = false;
-               sneak = false;
-               LMB = false;
-               RMB = false;
-               pitch = 0;
-               yaw = 0;
-               sidew_move_joystick_axis = .0f;
-               forw_move_joystick_axis = .0f;
-       }
+       PlayerControl() = default;
 
        PlayerControl(
                bool a_up,
@@ -82,20 +68,20 @@ struct PlayerControl
                sidew_move_joystick_axis = a_sidew_move_joystick_axis;
                forw_move_joystick_axis = a_forw_move_joystick_axis;
        }
-       bool up;
-       bool down;
-       bool left;
-       bool right;
-       bool jump;
-       bool aux1;
-       bool sneak;
-       bool zoom;
-       bool LMB;
-       bool RMB;
-       float pitch;
-       float yaw;
-       float sidew_move_joystick_axis;
-       float forw_move_joystick_axis;
+       bool up = false;
+       bool down = false;
+       bool left = false;
+       bool right = false;
+       bool jump = false;
+       bool aux1 = false;
+       bool sneak = false;
+       bool zoom = false;
+       bool LMB = false;
+       bool RMB = false;
+       float pitch = 0.0f;
+       float yaw = 0.0f;
+       float sidew_move_joystick_axis = 0.0f;
+       float forw_move_joystick_axis = 0.0f;
 };
 
 class Map;
@@ -103,9 +89,6 @@ struct CollisionInfo;
 struct HudElement;
 class Environment;
 
-// IMPORTANT:
-// Do *not* perform an assignment or copy operation on a Player or
-// RemotePlayer object!  This will copy the lock held for HUD synchronization
 class Player
 {
 public:
@@ -113,65 +96,25 @@ class Player
        Player(const char *name, IItemDefManager *idef);
        virtual ~Player() = 0;
 
+       DISABLE_CLASS_COPY(Player);
+
        virtual void move(f32 dtime, Environment *env, f32 pos_max_d)
        {}
        virtual void move(f32 dtime, Environment *env, f32 pos_max_d,
                        std::vector<CollisionInfo> *collision_info)
        {}
 
-       v3f getSpeed()
+       const v3f &getSpeed() const
        {
                return m_speed;
        }
 
-       void setSpeed(v3f speed)
+       void setSpeed(const v3f &speed)
        {
                m_speed = speed;
        }
 
-       v3f getPosition()
-       {
-               return m_position;
-       }
-
-       v3s16 getLightPosition() const;
-
-       v3f getEyeOffset()
-       {
-               float eye_height = camera_barely_in_ceiling ? 1.5f : 1.625f;
-               return v3f(0, BS * eye_height, 0);
-       }
-
-       v3f getEyePosition()
-       {
-               return m_position + getEyeOffset();
-       }
-
-       virtual void setPosition(const v3f &position)
-       {
-               m_position = position;
-       }
-
-       virtual void setPitch(f32 pitch)
-       {
-               m_pitch = pitch;
-       }
-
-       virtual void setYaw(f32 yaw)
-       {
-               m_yaw = yaw;
-       }
-
-       f32 getPitch() const { return m_pitch; }
-       f32 getYaw() const { return m_yaw; }
-       u16 getBreath() const { return m_breath; }
-
-       virtual void setBreath(u16 breath) { m_breath = breath; }
-
-       f32 getRadPitch() const { return m_pitch * core::DEGTORAD; }
-       f32 getRadYaw() const { return m_yaw * core::DEGTORAD; }
        const char *getName() const { return m_name; }
-       aabb3f getCollisionbox() const { return m_collisionbox; }
 
        u32 getFreeHudID()
        {
@@ -183,7 +126,6 @@ class Player
                return size;
        }
 
-       bool camera_barely_in_ceiling;
        v3f eye_offset_first;
        v3f eye_offset_third;
 
@@ -205,16 +147,12 @@ class Player
        v2s32 local_animations[4];
        float local_animation_speed;
 
-       u16 hp;
-
-       u16 peer_id;
-
        std::string inventory_formspec;
 
        PlayerControl control;
        const PlayerControl& getPlayerControl() { return control; }
 
-       u32 keyPressed;
+       u32 keyPressed = 0;
 
        HudElement* getHud(u32 id);
        u32         addHud(HudElement* hud);
@@ -225,20 +163,12 @@ class Player
        s32 hud_hotbar_itemcount;
 protected:
        char m_name[PLAYERNAME_SIZE];
-       u16 m_breath;
-       f32 m_pitch;
-       f32 m_yaw;
        v3f m_speed;
-       v3f m_position;
-       aabb3f m_collisionbox;
 
        std::vector<HudElement *> hud;
 private:
        // Protect some critical areas
        // hud for example can be modified by EmergeThread
        // and ServerThread
-       Mutex m_mutex;
+       std::mutex m_mutex;
 };
-
-#endif
-