X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserverobject.h;h=6525270f624eec1436577d8030e7122bb0e4f1c8;hb=22e186b4aa88b585e71500c4e9a03bf69b0b6191;hp=8029cf584e49036d3b5924bc5254650e49eeb79b;hpb=3241ad3ae8da687262db32776a1da2ef7403b3e9;p=minetest.git

diff --git a/src/serverobject.h b/src/serverobject.h
index 8029cf584..6525270f6 100644
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -1,18 +1,18 @@
 /*
-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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -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 @@ 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
@@ -96,8 +96,7 @@ class ServerActiveObject : public ActiveObject
 		{ 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 @@ 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
@@ -153,6 +152,12 @@ class ServerActiveObject : public ActiveObject
 
 	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()