X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fstaticobject.h;h=43f542632298a981ec2c3989f0c69009511f6508;hb=5a3b8e34b36a1f9b1f38f91483fc25d23b142f21;hp=c8427fe47bd74dc2995c840f43b20202ec4f86e8;hpb=22e186b4aa88b585e71500c4e9a03bf69b0b6191;p=oweals%2Fminetest.git

diff --git a/src/staticobject.h b/src/staticobject.h
index c8427fe47..43f542632 100644
--- a/src/staticobject.h
+++ b/src/staticobject.h
@@ -17,26 +17,23 @@ 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>
 #include <sstream>
+#include <vector>
+#include <map>
 #include "debug.h"
 
 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_):
+	StaticObject() = default;
+	StaticObject(u8 type_, const v3f &pos_, const std::string &data_):
 		type(type_),
 		pos(pos_),
 		data(data_)
@@ -52,9 +49,9 @@ class StaticObjectList
 public:
 	/*
 		Inserts an object to the container.
-		Id must be unique or 0.
+		Id must be unique (active) or 0 (stored).
 	*/
-	void insert(u16 id, StaticObject obj)
+	void insert(u16 id, const StaticObject &obj)
 	{
 		if(id == 0)
 		{
@@ -62,42 +59,38 @@ public:
 		}
 		else
 		{
-			if(m_active.find(id) != NULL)
+			if(m_active.find(id) != m_active.end())
 			{
 				dstream<<"ERROR: StaticObjectList::insert(): "
 						<<"id already exists"<<std::endl;
-				assert(0);
-				return;
+				FATAL_ERROR("StaticObjectList::insert()");
 			}
-			m_active.insert(id, obj);
+			m_active[id] = obj;
 		}
 	}
 
 	void remove(u16 id)
 	{
-		assert(id != 0);
-		if(m_active.find(id) == NULL)
+		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;
 		}
-		m_active.remove(id);
+		m_active.erase(id);
 	}
 
 	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.
 		The caller directly manipulates these containers.
 	*/
-	core::list<StaticObject> m_stored;
-	core::map<u16, StaticObject> m_active;
+	std::vector<StaticObject> m_stored;
+	std::map<u16, StaticObject> m_active;
 
 private:
 };
-
-#endif
-