+ fireflies

[minetest.git] / src / nodemetadata.cpp

diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp
index 2405e7601ea7d42c5b0c67840164323ec8ba5d40..3edf6d3c28ac58e6fe0ae7ab8eb6ff7c281c9987 100644 (file)
--- a/src/nodemetadata.cpp
+++ b/src/nodemetadata.cpp
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "exceptions.h"
 #include "inventory.h"
 #include <sstream>
+#include "content_mapnode.h"
 
 /*
        NodeMetadata
@@ -96,134 +97,17 @@ void NodeMetadata::registerType(u16 id, Factory f)
 }
 
 /*
-       SignNodeMetadata
-*/
-
-SignNodeMetadata::SignNodeMetadata(std::string text):
-       m_text(text)
-{
-       NodeMetadata::registerType(typeId(), create);
-}
-u16 SignNodeMetadata::typeId() const
-{
-       return CONTENT_SIGN_WALL;
-}
-NodeMetadata* SignNodeMetadata::create(std::istream &is)
-{
-       std::string text = deSerializeString(is);
-       return new SignNodeMetadata(text);
-}
-NodeMetadata* SignNodeMetadata::clone()
-{
-       return new SignNodeMetadata(m_text);
-}
-void SignNodeMetadata::serializeBody(std::ostream &os)
-{
-       os<<serializeString(m_text);
-}
-std::string SignNodeMetadata::infoText()
-{
-       return std::string("\"")+m_text+"\"";
-}
-
-/*
-       ChestNodeMetadata
-*/
-
-ChestNodeMetadata::ChestNodeMetadata()
-{
-       NodeMetadata::registerType(typeId(), create);
-       
-       m_inventory = new Inventory();
-       m_inventory->addList("0", 8*4);
-}
-ChestNodeMetadata::~ChestNodeMetadata()
-{
-       delete m_inventory;
-}
-u16 ChestNodeMetadata::typeId() const
-{
-       return CONTENT_CHEST;
-}
-NodeMetadata* ChestNodeMetadata::create(std::istream &is)
-{
-       ChestNodeMetadata *d = new ChestNodeMetadata();
-       d->m_inventory->deSerialize(is);
-       return d;
-}
-NodeMetadata* ChestNodeMetadata::clone()
-{
-       ChestNodeMetadata *d = new ChestNodeMetadata();
-       *d->m_inventory = *m_inventory;
-       return d;
-}
-void ChestNodeMetadata::serializeBody(std::ostream &os)
-{
-       m_inventory->serialize(os);
-}
-std::string ChestNodeMetadata::infoText()
-{
-       return "Chest";
-}
-
-/*
-       FurnaceNodeMetadata
-*/
-
-FurnaceNodeMetadata::FurnaceNodeMetadata()
-{
-       NodeMetadata::registerType(typeId(), create);
-       
-       m_inventory = new Inventory();
-       m_inventory->addList("fuel", 1);
-       m_inventory->addList("src", 1);
-       m_inventory->addList("dst", 1);
-}
-FurnaceNodeMetadata::~FurnaceNodeMetadata()
-{
-       delete m_inventory;
-}
-u16 FurnaceNodeMetadata::typeId() const
-{
-       return CONTENT_FURNACE;
-}
-NodeMetadata* FurnaceNodeMetadata::clone()
-{
-       FurnaceNodeMetadata *d = new FurnaceNodeMetadata();
-       *d->m_inventory = *m_inventory;
-       return d;
-}
-NodeMetadata* FurnaceNodeMetadata::create(std::istream &is)
-{
-       FurnaceNodeMetadata *d = new FurnaceNodeMetadata();
-       d->m_inventory->deSerialize(is);
-       /*std::string params;
-       std::getline(is, params, '\n');*/
-       return d;
-}
-void FurnaceNodeMetadata::serializeBody(std::ostream &os)
-{
-       m_inventory->serialize(os);
-       // This line will contain the other parameters
-       //os<<"\n";
-}
-std::string FurnaceNodeMetadata::infoText()
-{
-       return "Furnace";
-}
-void FurnaceNodeMetadata::inventoryModified()
-{
-       dstream<<"Furnace inventory modification callback"<<std::endl;
-}
-
-/*
-       NodeMetadatalist
+       NodeMetadataList
 */
 
 void NodeMetadataList::serialize(std::ostream &os)
 {
        u8 buf[6];
        
+       u16 version = 1;
+       writeU16(buf, version);
+       os.write((char*)buf, 2);
+
        u16 count = m_data.size();
        writeU16(buf, count);
        os.write((char*)buf, 2);
@@ -249,6 +133,16 @@ void NodeMetadataList::deSerialize(std::istream &is)
 
        u8 buf[6];
        
+       is.read((char*)buf, 2);
+       u16 version = readU16(buf);
+
+       if(version > 1)
+       {
+               dstream<<__FUNCTION_NAME<<": version "<<version<<" not supported"
+                               <<std::endl;
+               throw SerializationError("NodeMetadataList::deSerialize");
+       }
+       
        is.read((char*)buf, 2);
        u16 count = readU16(buf);
        
@@ -318,3 +212,19 @@ void NodeMetadataList::set(v3s16 p, NodeMetadata *d)
        m_data.insert(p, d);
 }
 
+bool NodeMetadataList::step(float dtime)
+{
+       bool something_changed = false;
+       for(core::map<v3s16, NodeMetadata*>::Iterator
+                       i = m_data.getIterator();
+                       i.atEnd()==false; i++)
+       {
+               v3s16 p = i.getNode()->getKey();
+               NodeMetadata *meta = i.getNode()->getValue();
+               bool changed = meta->step(dtime);
+               if(changed)
+                       something_changed = true;
+       }
+       return something_changed;
+}
+