Merge pull request #59 from PrairieAstronomer/readme_irrlicht_change

[dragonfireclient.git] / src / staticobject.h

diff --git a/src/staticobject.h b/src/staticobject.h
index 6fccbdd4fa9624175fd86e078422a17c9cf8fbc7..6fb486193c9790fc2727c7283d959e808fe0107b 100644 (file)
--- a/src/staticobject.h
+++ b/src/staticobject.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -17,31 +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 <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);
@@ -52,9 +46,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 +56,38 @@ class StaticObjectList
                }
                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
-