diff options
author | Loic Blot <loic.blot@unix-experience.fr> | 2016-10-08 10:38:04 +0200 |
---|---|---|
committer | Ner'zhul <nerzhul@users.noreply.github.com> | 2016-10-08 11:36:28 +0200 |
commit | 8bcd10b872bc88c6f474913d6efb8d53c50c5ae1 (patch) | |
tree | 39a8af0048ed642eddc43c74ab9f736558663e9d /src/content_sao.h | |
parent | 0264e38bff12a3c6b81231ac1f6cd281179df744 (diff) | |
download | minetest-8bcd10b872bc88c6f474913d6efb8d53c50c5ae1.tar.gz minetest-8bcd10b872bc88c6f474913d6efb8d53c50c5ae1.tar.bz2 minetest-8bcd10b872bc88c6f474913d6efb8d53c50c5ae1.zip |
Player/LocalPlayer/RemotePlayer inheritance cleanup (part 1 on X)
* LocalPlayer take ownership of maxHudId as it's the only caller
* RemotePlayer take ownership of day night ratio as it's the only user
* Pass getPlayerControl as const reference to prevent object copy on each call (perf improvement in ObjectRef::l_get_player_control call)
* getPlayerSAO is now only RemotePlayer call
* get/setHotbarItemCount is now RemotePlayer owned
* Server: Use RemotePlayer instead of Player object on concerned call to properly fix the object type
* PlayerSAO now uses RemotePlayer instead of Player because it's only server side
* ObjectRef::getplayer also returns RemotePlayer as it's linked with PlayerSAO
Diffstat (limited to 'src/content_sao.h')
-rw-r--r-- | src/content_sao.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/content_sao.h b/src/content_sao.h index ccae90b77..c97db4922 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -160,7 +160,7 @@ public: class PlayerSAO : public ServerActiveObject { public: - PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_, + PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id_, const std::set<std::string> &privs, bool is_singleplayer); ~PlayerSAO(); ActiveObjectType getType() const @@ -231,14 +231,8 @@ public: void disconnected(); - Player* getPlayer() - { - return m_player; - } - u16 getPeerID() const - { - return m_peer_id; - } + RemotePlayer* getPlayer() { return m_player; } + u16 getPeerID() const { return m_peer_id; } // Cheat prevention @@ -291,7 +285,7 @@ public: private: std::string getPropertyPacket(); - Player *m_player; + RemotePlayer *m_player; u16 m_peer_id; Inventory *m_inventory; s16 m_damage; |