]> git.lizzy.rs Git - minetest.git/blobdiff - src/content_sao.h
Remove a useless struct keyword for ObjectProperties
[minetest.git] / src / content_sao.h
index a986acab046f9b698862b05f117e713997bd44b4..8510015c562846b96a0a55ce69437448d62a2988 100644 (file)
@@ -17,10 +17,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CONTENT_SAO_HEADER
-#define CONTENT_SAO_HEADER
+#pragma once
 
-#include <util/numeric.h>
+#include "network/networkprotocol.h"
+#include "util/numeric.h"
 #include "serverobject.h"
 #include "itemgroup.h"
 #include "object_properties.h"
@@ -30,7 +30,7 @@ class UnitSAO: public ServerActiveObject
 {
 public:
        UnitSAO(ServerEnvironment *env, v3f pos);
-       virtual ~UnitSAO() {}
+       virtual ~UnitSAO() = default;
 
        virtual void setYaw(const float yaw) { m_yaw = yaw; }
        float getYaw() const { return m_yaw; };
@@ -47,10 +47,13 @@ class UnitSAO: public ServerActiveObject
        const ItemGroupList &getArmorGroups();
        void setAnimation(v2f frame_range, float frame_speed, float frame_blend, bool frame_loop);
        void getAnimation(v2f *frame_range, float *frame_speed, float *frame_blend, bool *frame_loop);
+       void setAnimationSpeed(float frame_speed);
        void setBonePosition(const std::string &bone, v3f position, v3f rotation);
        void getBonePosition(const std::string &bone, v3f *position, v3f *rotation);
        void setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation);
        void getAttachment(int *parent_id, std::string *bone, v3f *position, v3f *rotation);
+       void clearChildAttachments();
+       void clearParentAttachment();
        void addAttachmentChild(int child_id);
        void removeAttachmentChild(int child_id);
        const std::unordered_set<int> &getAttachmentChildIds();
@@ -61,7 +64,7 @@ class UnitSAO: public ServerActiveObject
        float m_yaw = 0.0f;
 
        bool m_properties_sent = true;
-       struct ObjectProperties m_prop;
+       ObjectProperties m_prop;
 
        ItemGroupList m_armor_groups;
        bool m_armor_groups_sent = false;
@@ -71,6 +74,7 @@ class UnitSAO: public ServerActiveObject
        float m_animation_blend = 0.0f;
        bool m_animation_loop = true;
        bool m_animation_sent = false;
+       bool m_animation_speed_sent = false;
 
        // Stores position and rotation for each bone name
        std::unordered_map<std::string, core::vector2d<v3f>> m_bone_position;
@@ -82,6 +86,9 @@ class UnitSAO: public ServerActiveObject
        v3f m_attachment_position;
        v3f m_attachment_rotation;
        bool m_attachment_sent = false;
+private:
+       void onAttach(int parent_id);
+       void onDetach(int parent_id);
 };
 
 /*
@@ -103,6 +110,8 @@ class LuaEntitySAO : public UnitSAO
                        const std::string &data);
        void step(float dtime, bool send_recommended);
        std::string getClientInitializationData(u16 protocol_version);
+       bool isStaticAllowed() const
+       { return m_prop.static_save; }
        void getStaticData(std::string *result) const;
        int punch(v3f dir,
                        const ToolCapabilities *toolcap=NULL,
@@ -113,10 +122,14 @@ class LuaEntitySAO : public UnitSAO
        void moveTo(v3f pos, bool continuous);
        float getMinimumSavedMovement();
        std::string getDescription();
-       void setHP(s16 hp);
+       void setHP(s16 hp, const PlayerHPChangeReason &reason);
        s16 getHP() const;
        /* LuaEntitySAO-specific */
        void setVelocity(v3f velocity);
+       void addVelocity(v3f velocity)
+       {
+               m_velocity += velocity;
+       }
        v3f getVelocity();
        void setAcceleration(v3f acceleration);
        v3f getAcceleration();
@@ -157,7 +170,7 @@ class LagPool
        float m_pool = 15.0f;
        float m_max = 15.0f;
 public:
-       LagPool() {}
+       LagPool() = default;
 
        void setMax(float new_max)
        {
@@ -189,13 +202,13 @@ class LagPool
        }
 };
 
-typedef std::unordered_map<std::string, std::string> PlayerAttributes;
 class RemotePlayer;
 
 class PlayerSAO : public UnitSAO
 {
 public:
-       PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id_, bool is_singleplayer);
+       PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, session_t peer_id_,
+                       bool is_singleplayer);
        ~PlayerSAO();
        ActiveObjectType getType() const
        { return ACTIVEOBJECT_TYPE_PLAYER; }
@@ -240,7 +253,7 @@ class PlayerSAO : public UnitSAO
                ServerActiveObject *puncher,
                float time_from_last_punch);
        void rightClick(ServerActiveObject *clicker) {}
-       void setHP(s16 hp);
+       void setHP(s16 hp, const PlayerHPChangeReason &reason);
        void setHPRaw(s16 hp) { m_hp = hp; }
        s16 readDamage();
        u16 getBreath() const { return m_breath; }
@@ -260,49 +273,6 @@ class PlayerSAO : public UnitSAO
        int getWieldIndex() const;
        void setWieldIndex(int i);
 
-       /*
-               Modding interface
-       */
-       inline void setExtendedAttribute(const std::string &attr, const std::string &value)
-       {
-               m_extra_attributes[attr] = value;
-               m_extended_attributes_modified = true;
-       }
-
-       inline bool getExtendedAttribute(const std::string &attr, std::string *value)
-       {
-               if (m_extra_attributes.find(attr) == m_extra_attributes.end())
-                       return false;
-
-               *value = m_extra_attributes[attr];
-               return true;
-       }
-
-       inline void removeExtendedAttribute(const std::string &attr)
-       {
-               PlayerAttributes::iterator it = m_extra_attributes.find(attr);
-               if (it == m_extra_attributes.end())
-                       return;
-
-               m_extra_attributes.erase(it);
-               m_extended_attributes_modified = true;
-       }
-
-       inline const PlayerAttributes &getExtendedAttributes()
-       {
-               return m_extra_attributes;
-       }
-
-       inline bool extendedAttributesModified() const
-       {
-               return m_extended_attributes_modified;
-       }
-
-       inline void setExtendedAttributeModified(bool v)
-       {
-               m_extended_attributes_modified = v;
-       }
-
        /*
                PlayerSAO-specific
        */
@@ -310,7 +280,7 @@ class PlayerSAO : public UnitSAO
        void disconnected();
 
        RemotePlayer *getPlayer() { return m_player; }
-       u16 getPeerID() const { return m_peer_id; }
+       session_t getPeerID() const { return m_peer_id; }
 
        // Cheat prevention
 
@@ -324,7 +294,7 @@ class PlayerSAO : public UnitSAO
                m_time_from_last_punch = 0.0;
                return r;
        }
-       void noCheatDigStart(v3s16 p)
+       void noCheatDigStart(const v3s16 &p)
        {
                m_nocheat_dig_pos = p;
                m_nocheat_dig_time = 0;
@@ -365,13 +335,16 @@ class PlayerSAO : public UnitSAO
 
        v3f getEyePosition() const { return m_base_position + getEyeOffset(); }
        v3f getEyeOffset() const;
+       float getZoomFOV() const;
+
+       inline Metadata &getMeta() { return m_meta; }
 
 private:
        std::string getPropertyPacket();
        void unlinkPlayerSessionAndSave();
 
        RemotePlayer *m_player = nullptr;
-       u16 m_peer_id = 0;
+       session_t m_peer_id = 0;
        Inventory *m_inventory = nullptr;
        s16 m_damage = 0;
 
@@ -396,13 +369,12 @@ class PlayerSAO : public UnitSAO
        std::set<std::string> m_privs;
        bool m_is_singleplayer;
 
-       u16 m_breath = PLAYER_MAX_BREATH;
+       u16 m_breath = PLAYER_MAX_BREATH_DEFAULT;
        f32 m_pitch = 0.0f;
        f32 m_fov = 0.0f;
        s16 m_wanted_range = 0.0f;
 
-       PlayerAttributes m_extra_attributes;
-       bool m_extended_attributes_modified = false;
+       Metadata m_meta;
 public:
        float m_physics_override_speed = 1.0f;
        float m_physics_override_jump = 1.0f;
@@ -413,4 +385,63 @@ class PlayerSAO : public UnitSAO
        bool m_physics_override_sent = false;
 };
 
-#endif
+
+struct PlayerHPChangeReason {
+       enum Type : u8 {
+               SET_HP,
+               PLAYER_PUNCH,
+               FALL,
+               NODE_DAMAGE,
+               DROWNING,
+               RESPAWN
+       };
+
+       Type type = SET_HP;
+       ServerActiveObject *object;
+       bool from_mod = false;
+       int lua_reference = -1;
+
+       bool setTypeFromString(const std::string &typestr)
+       {
+               if (typestr == "set_hp")
+                       type = SET_HP;
+               else if (typestr == "punch")
+                       type = PLAYER_PUNCH;
+               else if (typestr == "fall")
+                       type = FALL;
+               else if (typestr == "node_damage")
+                       type = NODE_DAMAGE;
+               else if (typestr == "drown")
+                       type = DROWNING;
+               else if (typestr == "respawn")
+                       type = RESPAWN;
+               else
+                       return false;
+
+               return true;
+       }
+
+       std::string getTypeAsString() const
+       {
+               switch (type) {
+               case PlayerHPChangeReason::SET_HP:
+                       return "set_hp";
+               case PlayerHPChangeReason::PLAYER_PUNCH:
+                       return "punch";
+               case PlayerHPChangeReason::FALL:
+                       return "fall";
+               case PlayerHPChangeReason::NODE_DAMAGE:
+                       return "node_damage";
+               case PlayerHPChangeReason::DROWNING:
+                       return "drown";
+               case PlayerHPChangeReason::RESPAWN:
+                       return "respawn";
+               default:
+                       return "?";
+               }
+       }
+
+       PlayerHPChangeReason(Type type, ServerActiveObject *object=NULL):
+                       type(type), object(object)
+       {}
+};