X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserverobject.h;h=8e80225e4f8b7f60a937588abef358c90a13dd93;hb=63867b1a372a4d1a4a4ffdec9d0862b094211a89;hp=ece53fd98f278e1255c20d2c053ad575a5de7130;hpb=3cab24fbcfbbeb12cdd9f085167969e1a934bd59;p=minetest.git

diff --git a/src/serverobject.h b/src/serverobject.h
index ece53fd98..8e80225e4 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
@@ -69,9 +69,6 @@ class ServerActiveObject : public ActiveObject
 	// environment
 	virtual bool environmentDeletes() const
 	{ return true; }
-
-	virtual bool unlimitedTransferDistance() const
-	{ return false; }
 	
 	// Create a certain type of ServerActiveObject
 	static ServerActiveObject* create(u8 type,
@@ -97,8 +94,6 @@ class ServerActiveObject : public ActiveObject
 	// If object has moved less than this and data has not changed,
 	// saving to disk may be omitted
 	virtual float getMinimumSavedMovement();
-	
-	virtual bool isPeaceful(){return true;}
 
 	virtual std::string getDescription(){return "SAO";}
 	
@@ -118,7 +113,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 +147,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 +232,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