From eca1c964126cc7f6ae62ab274f7f1a83f03fedfd Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 26 Nov 2012 11:18:34 +0200 Subject: [PATCH] Move util/serialize.h out from staticobject.h for smaller header dependencies --- src/CMakeLists.txt | 1 + src/client.cpp | 1 + src/environment.cpp | 1 + src/mapblock.cpp | 1 + src/server.cpp | 1 + src/staticobject.cpp | 92 ++++++++++++++++++++++++++++++++++++++++++++ src/staticobject.h | 74 +++-------------------------------- 7 files changed, 102 insertions(+), 69 deletions(-) create mode 100644 src/staticobject.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eb42b7d3c..e1639b46f 100644 --- 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 f6e97c52e..1936c2ce9 100644 --- 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 889990ca5..b8e037376 100644 --- 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 2ae6e9bd7..e9c8fadff 100644 --- 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 f4da73fa5..6f80c82f7 100644 --- 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 index 000000000..2183f2ffe --- /dev/null +++ b/src/staticobject.cpp @@ -0,0 +1,92 @@ +/* +Minetest-c55 +Copyright (C) 2010-2012 celeron55, Perttu Ahola + +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<::Iterator + i = m_stored.begin(); + i != m_stored.end(); i++) + { + StaticObject &s_obj = *i; + s_obj.serialize(os); + } + for(core::map::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 #include -#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<::Iterator - i = m_stored.begin(); - i != m_stored.end(); i++) - { - StaticObject &s_obj = *i; - s_obj.serialize(os); - } - for(core::map::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