X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fstaticobject.h;h=6fb486193c9790fc2727c7283d959e808fe0107b;hb=9a5d43a4f517e4f2e1810fe7c08b10e650552c52;hp=95a1b945ee040bc8c90741e879ba314a2c24d285;hpb=ced6d20295a8263757d57c02a07ffcb66688a163;p=minetest.git

diff --git a/src/staticobject.h b/src/staticobject.h
index 95a1b945e..6fb486193 100644
--- a/src/staticobject.h
+++ b/src/staticobject.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef STATICOBJECT_HEADER
-#define STATICOBJECT_HEADER
+#pragma once
 
 #include "irrlichttypes_bloated.h"
 #include <string>
@@ -27,23 +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;
+	u8 type = 0;
 	v3f pos;
 	std::string data;
 
-	StaticObject():
-		type(0),
-		pos(0,0,0)
-	{
-	}
-	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);
@@ -56,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)
 		{
@@ -79,7 +71,7 @@ class StaticObjectList
 		assert(id != 0); // Pre-condition
 		if(m_active.find(id) == m_active.end())
 		{
-			dstream<<"WARNING: StaticObjectList::remove(): id="<<id
+			warningstream<<"StaticObjectList::remove(): id="<<id
 					<<" not found"<<std::endl;
 			return;
 		}
@@ -88,7 +80,7 @@ class StaticObjectList
 
 	void serialize(std::ostream &os);
 	void deSerialize(std::istream &is);
-	
+
 	/*
 		NOTE: When an object is transformed to active, it is removed
 		from m_stored and inserted to m_active.
@@ -99,6 +91,3 @@ class StaticObjectList
 
 private:
 };
-
-#endif
-