X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fstaticobject.h;h=6fb486193c9790fc2727c7283d959e808fe0107b;hb=8c1871fa2c066a2086988684256da97bd0f4ab6f;hp=c457f1384f946c6b10a97d419ef0381c16535abf;hpb=921151d97a2fb2238ab514324fb95e2732248b96;p=minetest.git

diff --git a/src/staticobject.h b/src/staticobject.h
index c457f1384..6fb486193 100644
--- a/src/staticobject.h
+++ b/src/staticobject.h
@@ -26,19 +26,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <map>
 #include "debug.h"
 
+class ServerActiveObject;
+
 struct StaticObject
 {
 	u8 type = 0;
 	v3f pos;
 	std::string data;
 
-	StaticObject() {}
-	StaticObject(u8 type_, v3f pos_, const std::string &data_):
-		type(type_),
-		pos(pos_),
-		data(data_)
-	{
-	}
+	StaticObject() = default;
+	StaticObject(const ServerActiveObject *s_obj, const v3f &pos_);
 
 	void serialize(std::ostream &os);
 	void deSerialize(std::istream &is, u8 version);
@@ -51,7 +48,7 @@ class StaticObjectList
 		Inserts an object to the container.
 		Id must be unique (active) or 0 (stored).
 	*/
-	void insert(u16 id, StaticObject obj)
+	void insert(u16 id, const StaticObject &obj)
 	{
 		if(id == 0)
 		{