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 208fb2cc86caf387cf1d9292d06e650d73892a9a..6fb486193c9790fc2727c7283d959e808fe0107b 100644 (file)
--- 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)
                {
@@ -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
-