Fix memory leak in run_tests()

[dragonfireclient.git] / src / content_sao.h

diff --git a/src/content_sao.h b/src/content_sao.h
index 5bcd3c77f6a4991fc64c69c83ba29cab5eb06c68..dca02bb00ba5e2e6cbb55b56072fe182f0a8e87f 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
@@ -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,9 +62,9 @@ class LuaEntitySAO : public ServerActiveObject
        void setHP(s16 hp);
        s16 getHP() const;
        void setArmorGroups(const ItemGroupList &armor_groups);
-       void setAnimations(v2f frames, float frame_speed, float frame_blend);
-       void setBonePosRot(std::string bone, v3f position, v3f rotation);
-       void setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation);
+       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 */
@@ -77,6 +78,7 @@ 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);
 private:
        std::string getPropertyPacket();
        void sendPosition(bool do_interpolate, bool is_movement_end);
@@ -99,16 +101,15 @@ class LuaEntitySAO : public ServerActiveObject
        float m_last_sent_position_timer;
        float m_last_sent_move_precision;
        bool m_armor_groups_sent;
-       
-       v2f m_animation_frames;
+
+       v2f m_animation_range;
        float m_animation_speed;
        float m_animation_blend;
-       bool m_animations_sent;
+       bool m_animation_sent;
+
+       std::map<std::string, core::vector2d<v3f> > m_bone_position;
+       bool m_bone_position_sent;
 
-       std::map<std::string, core::vector2d<v3f> > m_animation_bone;
-       bool m_animations_bone_sent;
-       
-       ServerActiveObject *m_parent;
        int m_attachment_parent_id;
        std::string m_attachment_bone;
        v3f m_attachment_position;
@@ -140,12 +141,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
@@ -160,9 +164,9 @@ class PlayerSAO : public ServerActiveObject
        void setHP(s16 hp);
        
        void setArmorGroups(const ItemGroupList &armor_groups);
-       void setAnimations(v2f frames, float frame_speed, float frame_blend);
-       void setBonePosRot(std::string bone, v3f position, v3f rotation);
-       void setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation);
+       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();
 
@@ -232,6 +236,8 @@ class PlayerSAO : public ServerActiveObject
                m_is_singleplayer = is_singleplayer;
        }
 
+       bool getCollisionBox(aabb3f *toset);
+
 private:
        std::string getPropertyPacket();
        
@@ -251,23 +257,20 @@ class PlayerSAO : public ServerActiveObject
        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_frames;
+       v2f m_animation_range;
        float m_animation_speed;
        float m_animation_blend;
-       bool m_animations_sent;
+       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;
 
-       std::map<std::string, core::vector2d<v3f> > m_animation_bone;
-       bool m_animations_bone_sent;
-       
-       ServerActiveObject *m_parent;
        int m_attachment_parent_id;
        std::string m_attachment_bone;
        v3f m_attachment_position;
@@ -276,10 +279,15 @@ class PlayerSAO : public ServerActiveObject
 
 public:
        // Some flags used by Server
-       bool m_teleported;
+       bool m_moved;
        bool m_inventory_not_sent;
        bool m_hp_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_sent;
 };
 
 #endif