diff options
Diffstat (limited to '')
| -rw-r--r-- | src/client/localplayer.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/client/localplayer.h b/src/client/localplayer.h index 45dc6776e..95dceb1f4 100644 --- a/src/client/localplayer.h +++ b/src/client/localplayer.h @@ -47,12 +47,9 @@ public: LocalPlayer(Client *client, const char *name); virtual ~LocalPlayer() = default; - ClientActiveObject *parent = nullptr; - // Initialize hp to 0, so that no hearts will be shown if server // doesn't support health points u16 hp = 0; - bool isAttached = false; bool touching_ground = false; // This oscillates so that the player jumps a bit above the surface bool in_liquid = false; @@ -72,8 +69,6 @@ public: // Temporary option for old move code bool physics_override_new_move = true; - v3f overridePosition; - void move(f32 dtime, Environment *env, f32 pos_max_d); void move(f32 dtime, Environment *env, f32 pos_max_d, std::vector<CollisionInfo> *collision_info); @@ -112,6 +107,8 @@ public: GenericCAO *getCAO() const { return m_cao; } + ClientActiveObject *getParent() const; + void setCAO(GenericCAO *toset) { assert(!m_cao); // Pre-condition |