X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserverobject.h;h=13a075a2575b52dd59ce3f99ca9caace8d8c6de8;hb=b8ba6318d6ed9edd59455674d39ff1d5018393df;hp=3dcb99552a5a8aeeacff1535a6daf46fa9199237;hpb=e42eeec8f626acbaa54ae31c10ca06c868c7931c;p=minetest.git

diff --git a/src/serverobject.h b/src/serverobject.h
index 3dcb99552..13a075a25 100644
--- 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
@@ -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,11 +152,13 @@ class ServerActiveObject : public ActiveObject
 
 	virtual void setArmorGroups(const ItemGroupList &armor_groups)
 	{}
-	virtual void setAnimations(v2f frames, float frame_speed, float frame_blend)
+	virtual void setPhysicsOverride(float physics_override_speed, float physics_override_jump, float physics_override_gravity)
 	{}
-	virtual void setBonePosRot(std::string bone, v3f position, v3f rotation)
+	virtual void setAnimation(v2f frames, float frame_speed, float frame_blend)
 	{}
-	virtual void setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation)
+	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; }
@@ -235,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