From ab9f3b92f2d4affe396692bc4963a9a2375bcbd4 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Mon, 14 Aug 2017 10:52:59 +0200 Subject: [PATCH] Player class: disable copy --- src/player.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/player.h b/src/player.h index fc799afb1..0b2cbbfb2 100644 --- a/src/player.h +++ b/src/player.h @@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irrlichttypes_bloated.h" #include "inventory.h" #include "constants.h" +#include "util/basic_macros.h" #include #include @@ -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,6 +96,8 @@ public: 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,