dofile error reporting for syntax errors

[minetest.git] / src / serverobject.h

diff --git a/src/serverobject.h b/src/serverobject.h
index 8e80225e4f8b7f60a937588abef358c90a13dd93..5de1071d17d5065d2af77ceed8e286abf8b53905 100644 (file)
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -58,7 +58,7 @@ class ServerActiveObject : public ActiveObject
        ServerActiveObject(ServerEnvironment *env, v3f pos);
        virtual ~ServerActiveObject();
 
-       virtual u8 getSendType() const
+       virtual ActiveObjectType getSendType() const
        { return getType(); }
 
        // Called after id has been set and has been inserted in environment
@@ -71,7 +71,7 @@ class ServerActiveObject : public ActiveObject
        { return true; }
        
        // Create a certain type of ServerActiveObject
-       static ServerActiveObject* create(u8 type,
+       static ServerActiveObject* create(ActiveObjectType type,
                        ServerEnvironment *env, u16 id, v3f pos,
                        const std::string &data);
        
@@ -147,13 +147,21 @@ class ServerActiveObject : public ActiveObject
 
        virtual void setArmorGroups(const ItemGroupList &armor_groups)
        {}
+       virtual ItemGroupList getArmorGroups()
+       { return ItemGroupList(); }
        virtual void setPhysicsOverride(float physics_override_speed, float physics_override_jump, float physics_override_gravity)
        {}
        virtual void setAnimation(v2f frames, float frame_speed, float frame_blend)
        {}
-       virtual void setBonePosition(std::string bone, v3f position, v3f rotation)
+       virtual void getAnimation(v2f *frames, float *frame_speed, float *frame_blend)
        {}
-       virtual void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)
+       virtual void setBonePosition(const std::string &bone, v3f position, v3f rotation)
+       {}
+       virtual void getBonePosition(const std::string &bone, v3f *position, v3f *lotation)
+       {}
+       virtual void setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation)
+       {}
+       virtual void getAttachment(int *parent_id, std::string *bone, v3f *position, v3f *rotation)
        {}
        virtual ObjectProperties* accessObjectProperties()
        { return NULL; }
@@ -218,7 +226,7 @@ class ServerActiveObject : public ActiveObject
        /*
                Queue of messages to be sent to the client
        */
-       Queue<ActiveObjectMessage> m_messages_out;
+       std::queue<ActiveObjectMessage> m_messages_out;
        
 protected:
        // Used for creating objects based on type