Add mod.conf to preview clientmod (#11020)

[dragonfireclient.git] / src / staticobject.h

diff --git a/src/staticobject.h b/src/staticobject.h
index 575c15b18d9de747c9fbaf717cb30ce169d90a22..6fb486193c9790fc2727c7283d959e808fe0107b 100644 (file)
--- a/src/staticobject.h
+++ b/src/staticobject.h
@@ -17,33 +17,25 @@ 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 <list>
+#include <vector>
 #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)
                {
@@ -68,8 +60,7 @@ class StaticObjectList
                        {
                                dstream<<"ERROR: StaticObjectList::insert(): "
                                                <<"id already exists"<<std::endl;
-                               assert(0);
-                               return;
+                               FATAL_ERROR("StaticObjectList::insert()");
                        }
                        m_active[id] = obj;
                }
@@ -77,10 +68,10 @@ class StaticObjectList
 
        void remove(u16 id)
        {
-               assert(id != 0);
+               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;
                }
@@ -89,17 +80,14 @@ 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.
                The caller directly manipulates these containers.
        */
-       std::list<StaticObject> m_stored;
+       std::vector<StaticObject> m_stored;
        std::map<u16, StaticObject> m_active;
 
 private:
 };
-
-#endif
-