Move util/serialize.h out from staticobject.h for smaller header dependencies

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb42b7d3c3c2f3ac80676e21b298495b7cd770cd..e1639b46fefab5f4ea123222e3dd86325b63d0ed 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -203,6 +203,7 @@ set(common_SRCS
        base64.cpp
        ban.cpp
        clientserver.cpp
+       staticobject.cpp
        util/serialize.cpp
        util/directiontables.cpp
        util/numeric.cpp

diff --git a/src/client.cpp b/src/client.cpp
index f6e97c52ec32c8879b3ee912405da035761a4d26..1936c2ce9aba6025fcd2132981fb9985f2df7335 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -42,6 +42,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/string.h"
 #include "hex.h"
 #include "IMeshCache.h"
+#include "util/serialize.h"
 
 static std::string getMediaCacheDir()
 {

diff --git a/src/environment.cpp b/src/environment.cpp
index 889990ca5dc5189b26fe607734befb84f6c8c162..b8e0373766a12f541d20b4742a55efa363d3f6fc 100644 (file)
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -43,6 +43,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #endif
 #include "daynightratio.h"
 #include "map.h"
+#include "util/serialize.h"
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index 2ae6e9bd7279259461d07788100f6e593fd0c987..e9c8fadff64a2c84794b8dcadc59da144172b851 100644 (file)
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -35,6 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapblock_mesh.h"
 #endif
 #include "util/string.h"
+#include "util/serialize.h"
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 

diff --git a/src/server.cpp b/src/server.cpp
index f4da73fa5273c67cef00ba58f03ee53ac5ba3bb1..6f80c82f7b5e371f42f59e3934a7b3f7390d64ac 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -54,6 +54,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/pointedthing.h"
 #include "util/mathconstants.h"
 #include "rollback.h"
+#include "util/serialize.h"
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 

diff --git a/src/staticobject.cpp b/src/staticobject.cpp
new file mode 100644 (file)
index 0000000..2183f2f
--- /dev/null
+++ b/src/staticobject.cpp
@@ -0,0 +1,92 @@
+/*
+Minetest-c55
+Copyright (C) 2010-2012 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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "staticobject.h"
+#include "util/serialize.h"
+
+void StaticObject::serialize(std::ostream &os)
+{
+       char buf[12];
+       // type
+       buf[0] = type;
+       os.write(buf, 1);
+       // pos
+       writeV3S32((u8*)buf, v3s32(pos.X*1000,pos.Y*1000,pos.Z*1000));
+       os.write(buf, 12);
+       // data
+       os<<serializeString(data);
+}
+void StaticObject::deSerialize(std::istream &is, u8 version)
+{
+       char buf[12];
+       // type
+       is.read(buf, 1);
+       type = buf[0];
+       // pos
+       is.read(buf, 12);
+       v3s32 intp = readV3S32((u8*)buf);
+       pos.X = (f32)intp.X/1000;
+       pos.Y = (f32)intp.Y/1000;
+       pos.Z = (f32)intp.Z/1000;
+       // data
+       data = deSerializeString(is);
+}
+
+void StaticObjectList::serialize(std::ostream &os)
+{
+       char buf[12];
+       // version
+       buf[0] = 0;
+       os.write(buf, 1);
+       // count
+       u16 count = m_stored.size() + m_active.size();
+       writeU16((u8*)buf, count);
+       os.write(buf, 2);
+       for(core::list<StaticObject>::Iterator
+                       i = m_stored.begin();
+                       i != m_stored.end(); i++)
+       {
+               StaticObject &s_obj = *i;
+               s_obj.serialize(os);
+       }
+       for(core::map<u16, StaticObject>::Iterator
+                       i = m_active.getIterator();
+                       i.atEnd()==false; i++)
+       {
+               StaticObject s_obj = i.getNode()->getValue();
+               s_obj.serialize(os);
+       }
+}
+void StaticObjectList::deSerialize(std::istream &is)
+{
+       char buf[12];
+       // version
+       is.read(buf, 1);
+       u8 version = buf[0];
+       // count
+       is.read(buf, 2);
+       u16 count = readU16((u8*)buf);
+       for(u16 i=0; i<count; i++)
+       {
+               StaticObject s_obj;
+               s_obj.deSerialize(is, version);
+               m_stored.push_back(s_obj);
+       }
+}
+

diff --git a/src/staticobject.h b/src/staticobject.h
index 87ba111ecf2ac14d4f88350f92498b91d0b32630..6fccbdd4fa9624175fd86e078422a17c9cf8fbc7 100644 (file)
--- a/src/staticobject.h
+++ b/src/staticobject.h
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_bloated.h"
 #include <string>
 #include <sstream>
-#include "util/serialize.h"
+#include "debug.h"
 
 struct StaticObject
 {
@@ -43,33 +43,8 @@ struct StaticObject
        {
        }
 
-       void serialize(std::ostream &os)
-       {
-               char buf[12];
-               // type
-               buf[0] = type;
-               os.write(buf, 1);
-               // pos
-               writeV3S32((u8*)buf, v3s32(pos.X*1000,pos.Y*1000,pos.Z*1000));
-               os.write(buf, 12);
-               // data
-               os<<serializeString(data);
-       }
-       void deSerialize(std::istream &is, u8 version)
-       {
-               char buf[12];
-               // type
-               is.read(buf, 1);
-               type = buf[0];
-               // pos
-               is.read(buf, 12);
-               v3s32 intp = readV3S32((u8*)buf);
-               pos.X = (f32)intp.X/1000;
-               pos.Y = (f32)intp.Y/1000;
-               pos.Z = (f32)intp.Z/1000;
-               // data
-               data = deSerializeString(is);
-       }
+       void serialize(std::ostream &os);
+       void deSerialize(std::istream &is, u8 version);
 };
 
 class StaticObjectList
@@ -110,47 +85,8 @@ public:
                m_active.remove(id);
        }
 
-       void serialize(std::ostream &os)
-       {
-               char buf[12];
-               // version
-               buf[0] = 0;
-               os.write(buf, 1);
-               // count
-               u16 count = m_stored.size() + m_active.size();
-               writeU16((u8*)buf, count);
-               os.write(buf, 2);
-               for(core::list<StaticObject>::Iterator
-                               i = m_stored.begin();
-                               i != m_stored.end(); i++)
-               {
-                       StaticObject &s_obj = *i;
-                       s_obj.serialize(os);
-               }
-               for(core::map<u16, StaticObject>::Iterator
-                               i = m_active.getIterator();
-                               i.atEnd()==false; i++)
-               {
-                       StaticObject s_obj = i.getNode()->getValue();
-                       s_obj.serialize(os);
-               }
-       }
-       void deSerialize(std::istream &is)
-       {
-               char buf[12];
-               // version
-               is.read(buf, 1);
-               u8 version = buf[0];
-               // count
-               is.read(buf, 2);
-               u16 count = readU16((u8*)buf);
-               for(u16 i=0; i<count; i++)
-               {
-                       StaticObject s_obj;
-                       s_obj.deSerialize(is, version);
-                       m_stored.push_back(s_obj);
-               }
-       }
+       void serialize(std::ostream &os);
+       void deSerialize(std::istream &is);
        
        /*
                NOTE: When an object is transformed to active, it is removed