Works for debian and a few other distributions but fails for even more so back to...

[minetest.git] / src / serverobject.h

diff --git a/src/serverobject.h b/src/serverobject.h
index 0130ca1bf4f40a34bea3799d787d9bc2a4d01155..13a075a2575b52dd59ce3f99ca9caace8d8c6de8 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,7 +20,7 @@ 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 "inventorymanager.h"
 #include "itemgroup.h"
@@ -62,7 +62,7 @@ class ServerActiveObject : public ActiveObject
        { 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
@@ -118,7 +118,7 @@ class ServerActiveObject : public ActiveObject
                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
@@ -152,6 +152,14 @@ class ServerActiveObject : public ActiveObject
 
        virtual void setArmorGroups(const ItemGroupList &armor_groups)
        {}
+       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 setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)
+       {}
        virtual ObjectProperties* accessObjectProperties()
        { return NULL; }
        virtual void notifyObjectPropertiesModified()
@@ -229,7 +237,7 @@ class ServerActiveObject : public ActiveObject
 
 private:
        // Used for creating objects based on type
-       static core::map<u16, Factory> m_types;
+       static std::map<u16, Factory> m_types;
 };
 
 #endif