LocalPlayer::accelerateHorizontal: cleanups

[oweals/minetest.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 3c945b100eb56033ba04a23ac68eb85fa5bd24fb..fc799afb17fc21d696bfc66c637a2a5c895581a4 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -22,9 +22,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "irrlichttypes_bloated.h"
 #include "inventory.h"
-#include "constants.h" // BS
-#include "threading/mutex.h"
+#include "constants.h"
 #include <list>
+#include <mutex>
 
 #define PLAYERNAME_SIZE 20
 
@@ -33,22 +33,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() {}
 
        PlayerControl(
                bool a_up,
@@ -82,20 +67,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;
@@ -129,49 +114,7 @@ public:
                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,23 +126,6 @@ public:
                return size;
        }
 
-       void setLocalAnimations(v2s32 frames[4], float frame_speed)
-       {
-               for (int i = 0; i < 4; i++)
-                       local_animations[i] = frames[i];
-               local_animation_speed = frame_speed;
-       }
-
-       void getLocalAnimations(v2s32 *frames, float *frame_speed)
-       {
-               for (int i = 0; i < 4; i++)
-                       frames[i] = local_animations[i];
-               *frame_speed = local_animation_speed;
-       }
-
-       virtual bool isLocal() const { return false; }
-
-       bool camera_barely_in_ceiling;
        v3f eye_offset_first;
        v3f eye_offset_third;
 
@@ -221,16 +147,14 @@ public:
        v2s32 local_animations[4];
        float local_animation_speed;
 
-       u16 hp;
-
-       u16 peer_id;
+       u16 peer_id = PEER_ID_INEXISTENT;
 
        std::string inventory_formspec;
 
        PlayerControl control;
        const PlayerControl& getPlayerControl() { return control; }
 
-       u32 keyPressed;
+       u32 keyPressed = 0;
 
        HudElement* getHud(u32 id);
        u32         addHud(HudElement* hud);
@@ -241,19 +165,14 @@ public:
        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