Schematics: Add indent-with-space option for schematic Lua table serialization

[dragonfireclient.git] / src / content_sao.h

diff --git a/src/content_sao.h b/src/content_sao.h
index 63e8ef4601f3234a3c0170d67acac704dfa74337..cc372ff5572a67b910f583a286248a41e5696d3a 100644 (file)
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -21,14 +21,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define CONTENT_SAO_HEADER
 
 #include "serverobject.h"
-#include "content_object.h"
 #include "itemgroup.h"
 #include "player.h"
 #include "object_properties.h"
 
-ServerActiveObject* createItemSAO(ServerEnvironment *env, v3f pos,
-                                  const std::string &itemstring);
-
 /*
        LuaEntitySAO needs some internals exposed.
 */
@@ -39,9 +35,9 @@ class LuaEntitySAO : public ServerActiveObject
        LuaEntitySAO(ServerEnvironment *env, v3f pos,
                     const std::string &name, const std::string &state);
        ~LuaEntitySAO();
-       u8 getType() const
+       ActiveObjectType getType() const
        { return ACTIVEOBJECT_TYPE_LUAENTITY; }
-       u8 getSendType() const
+       ActiveObjectType getSendType() const
        { return ACTIVEOBJECT_TYPE_GENERIC; }
        virtual void addedToEnvironment(u32 dtime_s);
        static ServerActiveObject* create(ServerEnvironment *env, v3f pos,
@@ -158,9 +154,9 @@ class PlayerSAO : public ServerActiveObject
        PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
                        const std::set<std::string> &privs, bool is_singleplayer);
        ~PlayerSAO();
-       u8 getType() const
+       ActiveObjectType getType() const
        { return ACTIVEOBJECT_TYPE_PLAYER; }
-       u8 getSendType() const
+       ActiveObjectType getSendType() const
        { return ACTIVEOBJECT_TYPE_GENERIC; }
        std::string getDescription();
 
@@ -171,7 +167,6 @@ class PlayerSAO : public ServerActiveObject
        void addedToEnvironment(u32 dtime_s);
        void removingFromEnvironment();
        bool isStaticAllowed() const;
-       bool unlimitedTransferDistance() const;
        std::string getClientInitializationData(u16 protocol_version);
        std::string getStaticData();
        bool isAttached();
@@ -210,7 +205,6 @@ class PlayerSAO : public ServerActiveObject
        Inventory* getInventory();
        const Inventory* getInventory() const;
        InventoryLocation getInventoryLocation() const;
-       void setInventoryModified();
        std::string getWieldList() const;
        int getWieldIndex() const;
        void setWieldIndex(int i);
@@ -320,13 +314,6 @@ class PlayerSAO : public ServerActiveObject
        bool m_attachment_sent;
 
 public:
-       // Some flags used by Server
-       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;