diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-12-01 18:23:58 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-12-01 18:23:58 +0200 |
| commit | ee0d3bacbce612c1abc6016cb7b0d684df25b820 (patch) | |
| tree | c11c0960cd3a70a795d089c0d2cf3592d4c68fb7 /src/player.h | |
| parent | 9dcfa882b13cdbe38b66fc1b61643da74f112342 (diff) | |
| download | minetest-ee0d3bacbce612c1abc6016cb7b0d684df25b820.tar.gz minetest-ee0d3bacbce612c1abc6016cb7b0d684df25b820.tar.bz2 minetest-ee0d3bacbce612c1abc6016cb7b0d684df25b820.zip | |
Player-is-SAO WIP
Diffstat (limited to 'src/player.h')
| -rw-r--r-- | src/player.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/player.h b/src/player.h index 5ccff4675..34fb5128c 100644 --- a/src/player.h +++ b/src/player.h @@ -181,6 +181,8 @@ public: #include "serverobject.h" #include "content_object.h" // Object type IDs +class PlayerSAO; + class ServerRemotePlayer : public Player, public ServerActiveObject { public: @@ -197,12 +199,11 @@ public: { } - virtual void setPosition(const v3f &position) - { - Player::setPosition(position); - ServerActiveObject::setBasePosition(position); - } + virtual void setPosition(const v3f &position); + void setSAO(PlayerSAO *sao); + PlayerSAO* getSAO(); + /* ServerActiveObject interface */ u8 getType() const @@ -242,10 +243,13 @@ public: bool m_hp_not_sent; private: + + PlayerSAO *m_sao; }; #ifndef SERVER +#if 0 /* All the other players on the client are these */ @@ -337,6 +341,7 @@ private: f32 m_pos_animation_time_counter; v3f m_showpos; }; +#endif #endif // !SERVER |