/*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 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
#include "irrlichttypes_bloated.h"
#include <string>
#include <sstream>
-#include "util/serialize.h"
+#include <list>
+#include <map>
+#include "debug.h"
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
public:
/*
Inserts an object to the container.
- Id must be unique or 0.
+ Id must be unique (active) or 0 (stored).
*/
void insert(u16 id, StaticObject obj)
{
}
else
{
- if(m_active.find(id) != NULL)
+ if(m_active.find(id) != m_active.end())
{
dstream<<"ERROR: StaticObjectList::insert(): "
<<"id already exists"<<std::endl;
assert(0);
return;
}
- m_active.insert(id, obj);
+ m_active[id] = obj;
}
}
void remove(u16 id)
{
assert(id != 0);
- if(m_active.find(id) == NULL)
+ if(m_active.find(id) == m_active.end())
{
dstream<<"WARNING: StaticObjectList::remove(): id="<<id
<<" not found"<<std::endl;
return;
}
- m_active.remove(id);
+ m_active.erase(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
from m_stored and inserted to m_active.
The caller directly manipulates these containers.
*/
- core::list<StaticObject> m_stored;
- core::map<u16, StaticObject> m_active;
+ std::list<StaticObject> m_stored;
+ std::map<u16, StaticObject> m_active;
private:
};