Revert "Make Lint Happy"

[dragonfireclient.git] / src / staticobject.cpp

diff --git a/src/staticobject.cpp b/src/staticobject.cpp
index 79762e0033eb1235326eb08c7662e33a3e56f946..5ccb7baf5227893eeb366693eca6c226349dda76 100644 (file)
--- a/src/staticobject.cpp
+++ b/src/staticobject.cpp
@@ -21,8 +21,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/serialize.h"
 #include "server/serveractiveobject.h"
 
-StaticObject::StaticObject(const ServerActiveObject *s_obj, const v3f &pos_) :
-               type(s_obj->getType()), pos(pos_)
+StaticObject::StaticObject(const ServerActiveObject *s_obj, const v3f &pos_):
+       type(s_obj->getType()),
+       pos(pos_)
 {
        s_obj->getStaticData(&data);
 }
@@ -34,7 +35,7 @@ void StaticObject::serialize(std::ostream &os)
        // pos
        writeV3F1000(os, pos);
        // data
-       os << serializeString(data);
+       os<<serializeString(data);
 }
 void StaticObject::deSerialize(std::istream &is, u8 version)
 {
@@ -55,13 +56,12 @@ void StaticObjectList::serialize(std::ostream &os)
        // count
        size_t count = m_stored.size() + m_active.size();
        // Make sure it fits into u16, else it would get truncated and cause e.g.
-       // issue #2610 (Invalid block data in database: unsupported NameIdMapping
-       // version).
+       // issue #2610 (Invalid block data in database: unsupported NameIdMapping version).
        if (count > U16_MAX) {
                errorstream << "StaticObjectList::serialize(): "
-                           << "too many objects (" << count << ") in list, "
-                           << "not writing them to disk." << std::endl;
-               writeU16(os, 0); // count = 0
+                       << "too many objects (" << count << ") in list, "
+                       << "not writing them to disk." << std::endl;
+               writeU16(os, 0);  // count = 0
                return;
        }
        writeU16(os, count);
@@ -79,10 +79,10 @@ void StaticObjectList::deSerialize(std::istream &is)
 {
        if (m_active.size()) {
                errorstream << "StaticObjectList::deSerialize(): "
-                           << "deserializing objects while " << m_active.size()
-                           << " active objects already exist (not cleared). "
-                           << m_stored.size() << " stored objects _were_ cleared"
-                           << std::endl;
+                       << "deserializing objects while " << m_active.size()
+                       << " active objects already exist (not cleared). "
+                       << m_stored.size() << " stored objects _were_ cleared"
+                       << std::endl;
        }
        m_stored.clear();
 
@@ -90,9 +90,10 @@ void StaticObjectList::deSerialize(std::istream &is)
        u8 version = readU8(is);
        // count
        u16 count = readU16(is);
-       for (u16 i = 0; i < count; i++) {
+       for(u16 i = 0; i < count; i++) {
                StaticObject s_obj;
                s_obj.deSerialize(is, version);
                m_stored.push_back(s_obj);
        }
 }
+