VoxelArea: add_{x,y,z,p} must be static

[minetest.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index fc799afb17fc21d696bfc66c637a2a5c895581a4..e343f55a5432fa698b127d6ba00b9f18523c1646 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -17,12 +17,13 @@ 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>
 
@@ -33,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 struct PlayerControl
 {
-       PlayerControl() {}
+       PlayerControl() = default;
 
        PlayerControl(
                bool a_up,
@@ -88,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:
@@ -98,18 +96,20 @@ 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;
        }
@@ -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
-