diff options
author | Loic Blot <loic.blot@unix-experience.fr> | 2017-08-14 10:52:59 +0200 |
---|---|---|
committer | Loic Blot <loic.blot@unix-experience.fr> | 2017-08-14 10:52:59 +0200 |
commit | ab9f3b92f2d4affe396692bc4963a9a2375bcbd4 (patch) | |
tree | 443085ddcc92d69f1d702e0dfc351c9c5ad1dbd4 /src | |
parent | 182bd6ab45145b8a52e91d98511c7c1cd0c8f7f7 (diff) | |
download | minetest-ab9f3b92f2d4affe396692bc4963a9a2375bcbd4.tar.gz minetest-ab9f3b92f2d4affe396692bc4963a9a2375bcbd4.tar.bz2 minetest-ab9f3b92f2d4affe396692bc4963a9a2375bcbd4.zip |
Player class: disable copy
Diffstat (limited to 'src')
-rw-r--r-- | src/player.h | 6 |
1 files 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 <list> #include <mutex> @@ -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, |