X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcontent_nodemeta.cpp;h=79a32b6bf9a51755850c29db45b200c4fcaec1b6;hb=d1df09841d0eac7a88f638676b80ec848522cca5;hp=681e2b92584365e827fd39c62a2948cc8e54a86d;hpb=9d09103e481c4979ebb0130a9dee6265d0d6223b;p=dragonfireclient.git

diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index 681e2b925..79a32b6bf 100644
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -1,321 +1,200 @@
 /*
-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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+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 General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+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 "content_nodemeta.h"
+#include "nodemetadata.h"
+#include "nodetimer.h"
 #include "inventory.h"
-#include "content_mapnode.h"
-
-/*
-	SignNodeMetadata
-*/
-
-// Prototype
-SignNodeMetadata proto_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
-*/
-
-// Prototype
-ChestNodeMetadata proto_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";
-}
-bool ChestNodeMetadata::nodeRemovalDisabled()
-{
-	/*
-		Disable removal if chest contains something
-	*/
-	InventoryList *list = m_inventory->getList("0");
-	if(list == NULL)
+#include "log.h"
+#include "serialization.h"
+#include "util/serialize.h"
+#include "util/string.h"
+#include "constants.h" // MAP_BLOCKSIZE
+#include <sstream>
+
+#define NODEMETA_GENERIC 1
+#define NODEMETA_SIGN 14
+#define NODEMETA_CHEST 15
+#define NODEMETA_FURNACE 16
+#define NODEMETA_LOCKABLE_CHEST 17
+
+// Returns true if node timer must be set
+static bool content_nodemeta_deserialize_legacy_body(
+		std::istream &is, s16 id, NodeMetadata *meta)
+{
+	meta->clear();
+
+	if(id == NODEMETA_GENERIC) // GenericNodeMetadata (0.4-dev)
+	{
+		meta->getInventory()->deSerialize(is);
+		deSerializeLongString(is);  // m_text
+		deSerializeString(is);  // m_owner
+
+		meta->setString("infotext",deSerializeString(is));
+		meta->setString("formspec",deSerializeString(is));
+		readU8(is);  // m_allow_text_input
+		readU8(is);  // m_allow_removal
+		readU8(is);  // m_enforce_owner
+
+		int num_vars = readU32(is);
+		for(int i=0; i<num_vars; i++){
+			std::string name = deSerializeString(is);
+			std::string var = deSerializeLongString(is);
+			meta->setString(name, var);
+		}
 		return false;
-	if(list->getUsedSlots() == 0)
+	}
+	else if(id == NODEMETA_SIGN) // SignNodeMetadata
+	{
+		meta->setString("text", deSerializeString(is));
+		//meta->setString("infotext","\"${text}\"");
+		meta->setString("infotext",
+				std::string("\"") + meta->getString("text") + "\"");
+		meta->setString("formspec","field[text;;${text}]");
 		return false;
-	return true;
-}
-std::string ChestNodeMetadata::getInventoryDrawSpecString()
-{
-	return
-		"invsize[8,9;]"
-		"list[current_name;0;0,0;8,4;]"
-		"list[current_player;main;0,5;8,4;]";
-}
-
-/*
-	FurnaceNodeMetadata
-*/
-
-// Prototype
-FurnaceNodeMetadata proto_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", 4);
+	}
+	else if(id == NODEMETA_CHEST) // ChestNodeMetadata
+	{
+		meta->getInventory()->deSerialize(is);
 
-	m_step_accumulator = 0;
-	m_fuel_totaltime = 0;
-	m_fuel_time = 0;
-	m_src_totaltime = 0;
-	m_src_time = 0;
-}
-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();
+		// Rename inventory list "0" to "main"
+		Inventory *inv = meta->getInventory();
+		if(!inv->getList("main") && inv->getList("0")){
+			inv->getList("0")->setName("main");
+		}
+		assert(inv->getList("main") && !inv->getList("0"));
 
-	d->m_inventory->deSerialize(is);
+		meta->setString("formspec","size[8,9]"
+				"list[current_name;main;0,0;8,4;]"
+				"list[current_player;main;0,5;8,4;]");
+		return false;
+	}
+	else if(id == NODEMETA_LOCKABLE_CHEST) // LockingChestNodeMetadata
+	{
+		meta->setString("owner", deSerializeString(is));
+		meta->getInventory()->deSerialize(is);
 
-	int temp;
-	is>>temp;
-	d->m_fuel_totaltime = (float)temp/10;
-	is>>temp;
-	d->m_fuel_time = (float)temp/10;
+		// Rename inventory list "0" to "main"
+		Inventory *inv = meta->getInventory();
+		if(!inv->getList("main") && inv->getList("0")){
+			inv->getList("0")->setName("main");
+		}
+		assert(inv->getList("main") && !inv->getList("0"));
 
-	return d;
-}
-void FurnaceNodeMetadata::serializeBody(std::ostream &os)
-{
-	m_inventory->serialize(os);
-	os<<itos(m_fuel_totaltime*10)<<" ";
-	os<<itos(m_fuel_time*10)<<" ";
-}
-std::string FurnaceNodeMetadata::infoText()
-{
-	//return "Furnace";
-	if(m_fuel_time >= m_fuel_totaltime)
+		meta->setString("formspec","size[8,9]"
+				"list[current_name;main;0,0;8,4;]"
+				"list[current_player;main;0,5;8,4;]");
+		return false;
+	}
+	else if(id == NODEMETA_FURNACE) // FurnaceNodeMetadata
 	{
-		InventoryList *src_list = m_inventory->getList("src");
-		assert(src_list);
-		InventoryItem *src_item = src_list->getItem(0);
-
-		if(src_item)
-			return "Furnace is out of fuel";
-		else
-			return "Furnace is inactive";
+		meta->getInventory()->deSerialize(is);
+		int temp = 0;
+		is>>temp;
+		meta->setString("fuel_totaltime", ftos((float)temp/10));
+		temp = 0;
+		is>>temp;
+		meta->setString("fuel_time", ftos((float)temp/10));
+		temp = 0;
+		is>>temp;
+		//meta->setString("src_totaltime", ftos((float)temp/10));
+		temp = 0;
+		is>>temp;
+		meta->setString("src_time", ftos((float)temp/10));
+
+		meta->setString("formspec","size[8,9]"
+			"list[current_name;fuel;2,3;1,1;]"
+			"list[current_name;src;2,1;1,1;]"
+			"list[current_name;dst;5,1;2,2;]"
+			"list[current_player;main;0,5;8,4;]");
+		return true;
 	}
 	else
 	{
-		std::string s = "Furnace is active (";
-		s += itos(m_fuel_time/m_fuel_totaltime*100);
-		s += "%)";
-		return s;
+		throw SerializationError("Unknown legacy node metadata");
 	}
 }
-void FurnaceNodeMetadata::inventoryModified()
+
+static bool content_nodemeta_deserialize_legacy_meta(
+		std::istream &is, NodeMetadata *meta)
 {
-	dstream<<"Furnace inventory modification callback"<<std::endl;
+	// Read id
+	s16 id = readS16(is);
+
+	// Read data
+	std::string data = deSerializeString(is);
+	std::istringstream tmp_is(data, std::ios::binary);
+	return content_nodemeta_deserialize_legacy_body(tmp_is, id, meta);
 }
-bool FurnaceNodeMetadata::step(float dtime)
+
+void content_nodemeta_deserialize_legacy(std::istream &is,
+		NodeMetadataList *meta, NodeTimerList *timers,
+		IItemDefManager *item_def_mgr)
 {
-	if(dtime > 60.0)
-		dstream<<"Furnace stepping a long time ("<<dtime<<")"<<std::endl;
-	// Update at a fixed frequency
-	const float interval = 2.0;
-	m_step_accumulator += dtime;
-	bool changed = false;
-	while(m_step_accumulator > interval)
+	meta->clear();
+	timers->clear();
+
+	u16 version = readU16(is);
+
+	if(version > 1)
 	{
-		m_step_accumulator -= interval;
-		dtime = interval;
+		infostream<<FUNCTION_NAME<<": version "<<version<<" not supported"
+				<<std::endl;
+		throw SerializationError(FUNCTION_NAME);
+	}
 
-		//dstream<<"Furnace step dtime="<<dtime<<std::endl;
-		
-		InventoryList *dst_list = m_inventory->getList("dst");
-		assert(dst_list);
+	u16 count = readU16(is);
 
-		InventoryList *src_list = m_inventory->getList("src");
-		assert(src_list);
-		InventoryItem *src_item = src_list->getItem(0);
-		
-		// Start only if there are free slots in dst, so that it can
-		// accomodate any result item
-		if(dst_list->getFreeSlots() > 0 && src_item && src_item->isCookable())
-		{
-			m_src_totaltime = 3;
-		}
-		else
-		{
-			m_src_time = 0;
-			m_src_totaltime = 0;
-		}
-		
-		/*
-			If fuel is burning, increment the burn counters.
-			If item finishes cooking, move it to result.
-		*/
-		if(m_fuel_time < m_fuel_totaltime)
+	for(u16 i=0; i<count; i++)
+	{
+		u16 p16 = readU16(is);
+
+		v3s16 p(0,0,0);
+		p.Z += p16 / MAP_BLOCKSIZE / MAP_BLOCKSIZE;
+		p16 -= p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE;
+		p.Y += p16 / MAP_BLOCKSIZE;
+		p16 -= p.Y * MAP_BLOCKSIZE;
+		p.X += p16;
+
+		if(meta->get(p) != NULL)
 		{
-			//dstream<<"Furnace is active"<<std::endl;
-			m_fuel_time += dtime;
-			m_src_time += dtime;
-			if(m_src_time >= m_src_totaltime && m_src_totaltime > 0.001
-					&& src_item)
-			{
-				InventoryItem *cookresult = src_item->createCookResult();
-				dst_list->addItem(cookresult);
-				src_list->decrementMaterials(1);
-				m_src_time = 0;
-				m_src_totaltime = 0;
-			}
-			changed = true;
+			warningstream<<FUNCTION_NAME<<": "
+					<<"already set data at position"
+					<<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring."
+					<<std::endl;
 			continue;
 		}
-		
-		/*
-			If there is no source item or source item is not cookable, stop loop.
-		*/
-		if(src_item == NULL || m_src_totaltime < 0.001)
-		{
-			m_step_accumulator = 0;
-			break;
-		}
-		
-		//dstream<<"Furnace is out of fuel"<<std::endl;
 
-		InventoryList *fuel_list = m_inventory->getList("fuel");
-		assert(fuel_list);
-		InventoryItem *fuel_item = fuel_list->getItem(0);
+		NodeMetadata *data = new NodeMetadata(item_def_mgr);
+		bool need_timer = content_nodemeta_deserialize_legacy_meta(is, data);
+		meta->set(p, data);
 
-		if(ItemSpec(ITEM_MATERIAL, CONTENT_TREE).checkItem(fuel_item))
-		{
-			m_fuel_totaltime = 30;
-			m_fuel_time = 0;
-			fuel_list->decrementMaterials(1);
-			changed = true;
-		}
-		else if(ItemSpec(ITEM_MATERIAL, CONTENT_WOOD).checkItem(fuel_item))
-		{
-			m_fuel_totaltime = 30/4;
-			m_fuel_time = 0;
-			fuel_list->decrementMaterials(1);
-			changed = true;
-		}
-		else if(ItemSpec(ITEM_CRAFT, "Stick").checkItem(fuel_item))
-		{
-			m_fuel_totaltime = 30/4/4;
-			m_fuel_time = 0;
-			fuel_list->decrementMaterials(1);
-			changed = true;
-		}
-		else if(ItemSpec(ITEM_CRAFT, "lump_of_coal").checkItem(fuel_item))
-		{
-			m_fuel_totaltime = 40;
-			m_fuel_time = 0;
-			fuel_list->decrementMaterials(1);
-			changed = true;
-		}
-		else
-		{
-			//dstream<<"No fuel found"<<std::endl;
-			// No fuel, stop loop.
-			m_step_accumulator = 0;
-			break;
-		}
+		if(need_timer)
+			timers->set(NodeTimer(1., 0., p));
 	}
-	return changed;
 }
-std::string FurnaceNodeMetadata::getInventoryDrawSpecString()
+
+void content_nodemeta_serialize_legacy(std::ostream &os, NodeMetadataList *meta)
 {
-	return
-		"invsize[8,9;]"
-		"list[current_name;fuel;2,3;1,1;]"
-		"list[current_name;src;2,1;1,1;]"
-		"list[current_name;dst;5,1;2,2;]"
-		"list[current_player;main;0,5;8,4;]";
+	// Sorry, I was too lazy to implement this. --kahrl
+	writeU16(os, 1); // version
+	writeU16(os, 0); // count
 }
 
-
+// END