Merge remote branch 'origin/master'

[oweals/minetest.git] / src / serverobject.h

diff --git a/src/serverobject.h b/src/serverobject.h
index 635160a03f3f7f808bb83f13d970afe7a276cfe0..7a5b47bd16f671ecf95e43d38c75ee789f482c4a 100644 (file)
--- a/src/serverobject.h
+++ b/src/serverobject.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
@@ -20,11 +20,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SERVEROBJECT_HEADER
 #define SERVEROBJECT_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include "activeobject.h"
-#include "utility.h"
 #include "inventorymanager.h"
 #include "itemgroup.h"
+#include "util/container.h"
 
 /*
 
@@ -62,7 +62,7 @@ public:
        { return getType(); }
 
        // Called after id has been set and has been inserted in environment
-       virtual void addedToEnvironment(){};
+       virtual void addedToEnvironment(u32 dtime_s){};
        // Called before removing from environment
        virtual void removingFromEnvironment(){};
        // Returns true if object's deletion is the job of the
@@ -96,8 +96,7 @@ public:
                { setBasePosition(pos); }
        // If object has moved less than this and data has not changed,
        // saving to disk may be omitted
-       virtual float getMinimumSavedMovement()
-               { return 2.0*BS; }
+       virtual float getMinimumSavedMovement();
        
        virtual bool isPeaceful(){return true;}
 
@@ -119,7 +118,7 @@ public:
                The return value of this is passed to the client-side object
                when it is created
        */
-       virtual std::string getClientInitializationData(){return "";}
+       virtual std::string getClientInitializationData(u16 protocol_version){return "";}
        
        /*
                The return value of this is passed to the server-side object
@@ -153,6 +152,12 @@ public:
 
        virtual void setArmorGroups(const ItemGroupList &armor_groups)
        {}
+       virtual void setAnimation(v2f frames, float frame_speed, float frame_blend)
+       {}
+       virtual void setBonePosition(std::string bone, v3f position, v3f rotation)
+       {}
+       virtual void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)
+       {}
        virtual ObjectProperties* accessObjectProperties()
        { return NULL; }
        virtual void notifyObjectPropertiesModified()
@@ -230,7 +235,7 @@ protected:
 
 private:
        // Used for creating objects based on type
-       static core::map<u16, Factory> m_types;
+       static std::map<u16, Factory> m_types;
 };
 
 #endif