]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/staticobject.h
Turn off verbose info message introduced accidentally with ae9b1aa
[dragonfireclient.git] / src / staticobject.h
index 95a1b945ee040bc8c90741e879ba314a2c24d285..43f542632298a981ec2c3989f0c69009511f6508 100644 (file)
@@ -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>
@@ -29,16 +28,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 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_)
@@ -56,7 +51,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 +74,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 +83,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 +94,3 @@ class StaticObjectList
 
 private:
 };
-
-#endif
-