Switch back repository to dev-mode after 0.4.10 release.

[dragonfireclient.git] / src / content_sao.h

diff --git a/src/content_sao.h b/src/content_sao.h
index 05c77e2cb92e861b5be28437cca61255aeb281d8..63e8ef4601f3234a3c0170d67acac704dfa74337 100644 (file)
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "object_properties.h"
 
 ServerActiveObject* createItemSAO(ServerEnvironment *env, v3f pos,
-               const std::string itemstring);
+                                  const std::string &itemstring);
 
 /*
        LuaEntitySAO needs some internals exposed.
@@ -37,7 +37,7 @@ class LuaEntitySAO : public ServerActiveObject
 {
 public:
        LuaEntitySAO(ServerEnvironment *env, v3f pos,
-                       const std::string &name, const std::string &state);
+                    const std::string &name, const std::string &state);
        ~LuaEntitySAO();
        u8 getType() const
        { return ACTIVEOBJECT_TYPE_LUAENTITY; }
@@ -46,8 +46,9 @@ class LuaEntitySAO : public ServerActiveObject
        virtual void addedToEnvironment(u32 dtime_s);
        static ServerActiveObject* create(ServerEnvironment *env, v3f pos,
                        const std::string &data);
+       bool isAttached();
        void step(float dtime, bool send_recommended);
-       std::string getClientInitializationData();
+       std::string getClientInitializationData(u16 protocol_version);
        std::string getStaticData();
        int punch(v3f dir,
                        const ToolCapabilities *toolcap=NULL,
@@ -61,6 +62,9 @@ class LuaEntitySAO : public ServerActiveObject
        void setHP(s16 hp);
        s16 getHP() const;
        void setArmorGroups(const ItemGroupList &armor_groups);
+       void setAnimation(v2f frame_range, float frame_speed, float frame_blend);
+       void setBonePosition(std::string bone, v3f position, v3f rotation);
+       void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation);
        ObjectProperties* accessObjectProperties();
        void notifyObjectPropertiesModified();
        /* LuaEntitySAO-specific */
@@ -74,6 +78,8 @@ class LuaEntitySAO : public ServerActiveObject
        void setSprite(v2s16 p, int num_frames, float framelength,
                        bool select_horiz_by_yawpitch);
        std::string getName();
+       bool getCollisionBox(aabb3f *toset);
+       bool collideWithObjects();
 private:
        std::string getPropertyPacket();
        void sendPosition(bool do_interpolate, bool is_movement_end);
@@ -96,12 +102,56 @@ class LuaEntitySAO : public ServerActiveObject
        float m_last_sent_position_timer;
        float m_last_sent_move_precision;
        bool m_armor_groups_sent;
+
+       v2f m_animation_range;
+       float m_animation_speed;
+       float m_animation_blend;
+       bool m_animation_sent;
+
+       std::map<std::string, core::vector2d<v3f> > m_bone_position;
+       bool m_bone_position_sent;
+
+       int m_attachment_parent_id;
+       std::string m_attachment_bone;
+       v3f m_attachment_position;
+       v3f m_attachment_rotation;
+       bool m_attachment_sent;
 };
 
 /*
        PlayerSAO needs some internals exposed.
 */
 
+class LagPool
+{
+       float m_pool;
+       float m_max;
+public:
+       LagPool(): m_pool(15), m_max(15)
+       {}
+       void setMax(float new_max)
+       {
+               m_max = new_max;
+               if(m_pool > new_max)
+                       m_pool = new_max;
+       }
+       void add(float dtime)
+       {
+               m_pool -= dtime;
+               if(m_pool < 0)
+                       m_pool = 0;
+       }
+       bool grab(float dtime)
+       {
+               if(dtime <= 0)
+                       return true;
+               if(m_pool + dtime > m_max)
+                       return false;
+               m_pool += dtime;
+               return true;
+       }
+};
+
 class PlayerSAO : public ServerActiveObject
 {
 public:
@@ -122,12 +172,15 @@ class PlayerSAO : public ServerActiveObject
        void removingFromEnvironment();
        bool isStaticAllowed() const;
        bool unlimitedTransferDistance() const;
-       std::string getClientInitializationData();
+       std::string getClientInitializationData(u16 protocol_version);
        std::string getStaticData();
+       bool isAttached();
        void step(float dtime, bool send_recommended);
        void setBasePosition(const v3f &position);
        void setPos(v3f pos);
        void moveTo(v3f pos, bool continuous);
+       void setYaw(float);
+       void setPitch(float);
 
        /*
                Interaction interface
@@ -140,8 +193,13 @@ class PlayerSAO : public ServerActiveObject
        void rightClick(ServerActiveObject *clicker);
        s16 getHP() const;
        void setHP(s16 hp);
-       
+       s16 readDamage();
+       u16 getBreath() const;
+       void setBreath(u16 breath);
        void setArmorGroups(const ItemGroupList &armor_groups);
+       void setAnimation(v2f frame_range, float frame_speed, float frame_blend);
+       void setBonePosition(std::string bone, v3f position, v3f rotation);
+       void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation);
        ObjectProperties* accessObjectProperties();
        void notifyObjectPropertiesModified();
 
@@ -201,6 +259,12 @@ class PlayerSAO : public ServerActiveObject
        {
                m_nocheat_dig_pos = v3s16(32767, 32767, 32767);
        }
+       LagPool& getDigPool()
+       {
+               return m_dig_pool;
+       }
+       // Returns true if cheated
+       bool checkMovementCheat();
 
        // Other
 
@@ -211,16 +275,21 @@ class PlayerSAO : public ServerActiveObject
                m_is_singleplayer = is_singleplayer;
        }
 
+       bool getCollisionBox(aabb3f *toset);
+       bool collideWithObjects();
+
 private:
        std::string getPropertyPacket();
        
        Player *m_player;
        u16 m_peer_id;
        Inventory *m_inventory;
+       s16 m_damage;
 
        // Cheat prevention
+       LagPool m_dig_pool;
+       LagPool m_move_pool;
        v3f m_last_good_position;
-       float m_last_good_position_age;
        float m_time_from_last_punch;
        v3s16 m_nocheat_dig_pos;
        float m_nocheat_dig_time;
@@ -229,18 +298,41 @@ class PlayerSAO : public ServerActiveObject
        bool m_position_not_sent;
        ItemGroupList m_armor_groups;
        bool m_armor_groups_sent;
+
        bool m_properties_sent;
        struct ObjectProperties m_prop;
        // Cached privileges for enforcement
        std::set<std::string> m_privs;
        bool m_is_singleplayer;
 
+       v2f m_animation_range;
+       float m_animation_speed;
+       float m_animation_blend;
+       bool m_animation_sent;
+
+       std::map<std::string, core::vector2d<v3f> > m_bone_position; // Stores position and rotation for each bone name
+       bool m_bone_position_sent;
+
+       int m_attachment_parent_id;
+       std::string m_attachment_bone;
+       v3f m_attachment_position;
+       v3f m_attachment_rotation;
+       bool m_attachment_sent;
+
 public:
        // Some flags used by Server
-       bool m_teleported;
+       bool m_moved;
        bool m_inventory_not_sent;
        bool m_hp_not_sent;
+       bool m_breath_not_sent;
        bool m_wielded_item_not_sent;
+
+       float m_physics_override_speed;
+       float m_physics_override_jump;
+       float m_physics_override_gravity;
+       bool m_physics_override_sneak;
+       bool m_physics_override_sneak_glitch;
+       bool m_physics_override_sent;
 };
 
 #endif