Switch F3 to use 'enable_fog' setting

[minetest.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 0b2cbbfb27eab0e369ce8fa6c91fab082702830e..e343f55a5432fa698b127d6ba00b9f18523c1646 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -17,12 +17,12 @@ 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"
+#include "network/networkprotocol.h"
 #include "util/basic_macros.h"
 #include <list>
 #include <mutex>
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 struct PlayerControl
 {
-       PlayerControl() {}
+       PlayerControl() = default;
 
        PlayerControl(
                bool a_up,
@@ -104,12 +104,12 @@ class Player
                        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;
        }
@@ -147,8 +147,6 @@ class Player
        v2s32 local_animations[4];
        float local_animation_speed;
 
-       u16 peer_id = PEER_ID_INEXISTENT;
-
        std::string inventory_formspec;
 
        PlayerControl control;
@@ -174,6 +172,3 @@ class Player
        // and ServerThread
        std::mutex m_mutex;
 };
-
-#endif
-