X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserverobject.cpp;h=ca3d2c3b98d2790de87d64905446a6fb0e273e99;hb=581f950e10b40f2af4ede56c3fa78f13eccb610b;hp=ce19ea34f10a85d7b46aa1a8038e0dde24b7d777;hpb=014a3aea3257aadf53e50bcedd4d2da148bafea2;p=dragonfireclient.git

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index ce19ea34f..ca3d2c3b9 100644
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -20,9 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serverobject.h"
 #include <fstream>
 #include "inventory.h"
+#include "tooldef.h"
 
-ServerActiveObject::ServerActiveObject(ServerEnvironment *env, u16 id, v3f pos):
-	ActiveObject(id),
+ServerActiveObject::ServerActiveObject(ServerEnvironment *env, v3f pos):
+	ActiveObject(0),
 	m_known_by_count(0),
 	m_removed(false),
 	m_pending_deactivation(false),
@@ -53,7 +54,7 @@ ServerActiveObject* ServerActiveObject::create(u8 type,
 	}
 
 	Factory f = n->getValue();
-	ServerActiveObject *object = (*f)(env, id, pos, data);
+	ServerActiveObject *object = (*f)(env, pos, data);
 	return object;
 }
 
@@ -66,5 +67,10 @@ void ServerActiveObject::registerType(u16 type, Factory f)
 	m_types.insert(type, f);
 }
 
+void ServerActiveObject::getWieldDiggingProperties(ToolDiggingProperties *dst)
+{
+	*dst = ToolDiggingProperties();
+}
+