Optimize updateFastFaceRow processing by removing some TileSpec copy (#5678)

[oweals/minetest.git] / src / remoteplayer.h

diff --git a/src/remoteplayer.h b/src/remoteplayer.h
index 1b1a90de3d7d6205bca20d19bea55d00ae246291..4b96835fcf8df09906da277a152a2da8dfba96b3 100644 (file)
--- a/src/remoteplayer.h
+++ b/src/remoteplayer.h
@@ -25,26 +25,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 class PlayerSAO;
 
-enum RemotePlayerChatResult {
+enum RemotePlayerChatResult
+{
        RPLAYER_CHATRESULT_OK,
        RPLAYER_CHATRESULT_FLOODING,
        RPLAYER_CHATRESULT_KICK,
 };
+
 /*
        Player on the server
 */
 class RemotePlayer : public Player
 {
+       friend class PlayerDatabaseFiles;
+
 public:
        RemotePlayer(const char *name, IItemDefManager *idef);
        virtual ~RemotePlayer() {}
 
-       void save(std::string savedir, IGameDef *gamedef);
-       void deSerialize(std::istream &is, const std::string &playername);
+       void deSerialize(std::istream &is, const std::string &playername, PlayerSAO *sao);
 
        PlayerSAO *getPlayerSAO() { return m_sao; }
        void setPlayerSAO(PlayerSAO *sao) { m_sao = sao; }
-       void setPosition(const v3f &position);
 
        const RemotePlayerChatResult canSendChatMessage();
 
@@ -67,18 +69,9 @@ public:
                *ratio = m_day_night_ratio;
        }
 
-       // Use a function, if isDead can be defined by other conditions
-       bool isDead() const { return hp == 0; }
+       void setHotbarImage(const std::string &name) { hud_hotbar_image = name; }
 
-       void setHotbarImage(const std::string &name)
-       {
-               hud_hotbar_image = name;
-       }
-
-       std::string getHotbarImage() const
-       {
-               return hud_hotbar_image;
-       }
+       std::string getHotbarImage() const { return hud_hotbar_image; }
 
        void setHotbarSelectedImage(const std::string &name)
        {
@@ -90,14 +83,8 @@ public:
                return hud_hotbar_selected_image;
        }
 
-       // Deprecated
-       f32 getRadPitchDep() const { return -1.0 * m_pitch * core::DEGTORAD; }
-
-       // Deprecated
-       f32 getRadYawDep() const { return (m_yaw + 90.) * core::DEGTORAD; }
-
        void setSky(const video::SColor &bgcolor, const std::string &type,
-                               const std::vector<std::string> &params)
+                       const std::vector<std::string> &params)
        {
                m_sky_bgcolor = bgcolor;
                m_sky_type = type;
@@ -105,7 +92,7 @@ public:
        }
 
        void getSky(video::SColor *bgcolor, std::string *type,
-                               std::vector<std::string> *params)
+                       std::vector<std::string> *params)
        {
                *bgcolor = m_sky_bgcolor;
                *type = m_sky_type;
@@ -121,27 +108,6 @@ public:
                        inventory.setModified(x);
        }
 
-       virtual void setBreath(u16 breath)
-       {
-               if (breath != m_breath)
-                       m_dirty = true;
-               Player::setBreath(breath);
-       }
-
-       virtual void setPitch(f32 pitch)
-       {
-               if (pitch != m_pitch)
-                       m_dirty = true;
-               Player::setPitch(pitch);
-       }
-
-       virtual void setYaw(f32 yaw)
-       {
-               if (yaw != m_yaw)
-                       m_dirty = true;
-               Player::setYaw(yaw);
-       }
-
        void setLocalAnimations(v2s32 frames[4], float frame_speed)
        {
                for (int i = 0; i < 4; i++)
@@ -156,7 +122,10 @@ public:
                *frame_speed = local_animation_speed;
        }
 
+       void setDirty(bool dirty) { m_dirty = true; }
+
        u16 protocol_version;
+
 private:
        /*
                serialize() writes a bunch of text that can contain
@@ -164,6 +133,7 @@ private:
                deSerialize stops reading exactly at the right point.
        */
        void serialize(std::ostream &os);
+       void serializeExtraAttributes(std::string &output);
 
        PlayerSAO *m_sao;
        bool m_dirty;