Modify default active block range

[minetest.git] / src / content_nodemeta.cpp

diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index 7c0e817f8576a10606d883f28672d7a103bb7198..e6138a4010d6c39a677ab2513d7e55887eefa19b 100644 (file)
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_nodemeta.h"
 #include "inventory.h"
 #include "content_mapnode.h"
+#include "log.h"
 
 /*
        SignNodeMetadata
@@ -117,6 +118,70 @@ std::string ChestNodeMetadata::getInventoryDrawSpecString()
                "list[current_player;main;0,5;8,4;]";
 }
 
+/*
+       LockingChestNodeMetadata
+*/
+
+// Prototype
+LockingChestNodeMetadata proto_LockingChestNodeMetadata;
+
+LockingChestNodeMetadata::LockingChestNodeMetadata()
+{
+       NodeMetadata::registerType(typeId(), create);
+
+       m_inventory = new Inventory();
+       m_inventory->addList("0", 8*4);
+}
+LockingChestNodeMetadata::~LockingChestNodeMetadata()
+{
+       delete m_inventory;
+}
+u16 LockingChestNodeMetadata::typeId() const
+{
+       return CONTENT_LOCKABLE_CHEST;
+}
+NodeMetadata* LockingChestNodeMetadata::create(std::istream &is)
+{
+       LockingChestNodeMetadata *d = new LockingChestNodeMetadata();
+       d->setOwner(deSerializeString(is));
+       d->m_inventory->deSerialize(is);
+       return d;
+}
+NodeMetadata* LockingChestNodeMetadata::clone()
+{
+       LockingChestNodeMetadata *d = new LockingChestNodeMetadata();
+       *d->m_inventory = *m_inventory;
+       return d;
+}
+void LockingChestNodeMetadata::serializeBody(std::ostream &os)
+{
+       os<<serializeString(m_text);
+       m_inventory->serialize(os);
+}
+std::string LockingChestNodeMetadata::infoText()
+{
+       return "Locking Chest";
+}
+bool LockingChestNodeMetadata::nodeRemovalDisabled()
+{
+       /*
+               Disable removal if chest contains something
+       */
+       InventoryList *list = m_inventory->getList("0");
+       if(list == NULL)
+               return false;
+       if(list->getUsedSlots() == 0)
+               return false;
+       return true;
+}
+std::string LockingChestNodeMetadata::getInventoryDrawSpecString()
+{
+       return
+               "invsize[8,9;]"
+               "list[current_name;0;0,0;8,4;]"
+               "list[current_player;main;0,5;8,4;]";
+}
+
 /*
        FurnaceNodeMetadata
 */
@@ -182,7 +247,7 @@ std::string FurnaceNodeMetadata::infoText()
                assert(src_list);
                const InventoryItem *src_item = src_list->getItem(0);
 
-               if(src_item) {
+               if(src_item && src_item->isCookable()) {
                        InventoryList *dst_list = m_inventory->getList("dst");
                        if(!dst_list->roomForCookedItem(src_item))
                                return "Furnace is overloaded";
@@ -203,14 +268,32 @@ std::string FurnaceNodeMetadata::infoText()
                return s;
        }
 }
+bool FurnaceNodeMetadata::nodeRemovalDisabled()
+{
+       /*
+               Disable removal if furnace is not empty
+       */
+       InventoryList *list[3] = {m_inventory->getList("src"),
+       m_inventory->getList("dst"), m_inventory->getList("fuel")};
+       
+       for(int i = 0; i < 3; i++) {
+               if(list[i] == NULL)
+                       continue;
+               if(list[i]->getUsedSlots() == 0)
+                       continue;
+               return true;
+       }
+       return false;
+       
+}
 void FurnaceNodeMetadata::inventoryModified()
 {
-       dstream<<"Furnace inventory modification callback"<<std::endl;
+       infostream<<"Furnace inventory modification callback"<<std::endl;
 }
 bool FurnaceNodeMetadata::step(float dtime)
 {
        if(dtime > 60.0)
-               dstream<<"Furnace stepping a long time ("<<dtime<<")"<<std::endl;
+               infostream<<"Furnace stepping a long time ("<<dtime<<")"<<std::endl;
        // Update at a fixed frequency
        const float interval = 2.0;
        m_step_accumulator += dtime;
@@ -220,14 +303,14 @@ bool FurnaceNodeMetadata::step(float dtime)
                m_step_accumulator -= interval;
                dtime = interval;
 
-               //dstream<<"Furnace step dtime="<<dtime<<std::endl;
+               //infostream<<"Furnace step dtime="<<dtime<<std::endl;
                
                InventoryList *dst_list = m_inventory->getList("dst");
                assert(dst_list);
 
                InventoryList *src_list = m_inventory->getList("src");
                assert(src_list);
-               const InventoryItem *src_item = src_list->getItem(0);
+               InventoryItem *src_item = src_list->getItem(0);
                
                bool room_available = false;
                
@@ -252,7 +335,7 @@ bool FurnaceNodeMetadata::step(float dtime)
                */
                if(m_fuel_time < m_fuel_totaltime)
                {
-                       //dstream<<"Furnace is active"<<std::endl;
+                       //infostream<<"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
@@ -266,23 +349,28 @@ bool FurnaceNodeMetadata::step(float dtime)
                        }
                        changed = true;
                        
-                       // Fall through if the fuel item was used up this step
+                       // If the fuel was not used up this step, just keep burning it
                        if(m_fuel_time < m_fuel_totaltime)
                                continue;
                }
                
                /*
-                       If there is no source item or source item is not cookable,
-                       or furnace became overloaded, stop loop.
+                       Get the source again in case it has all burned
+               */
+               src_item = src_list->getItem(0);
+               
+               /*
+                       If there is no source item, or the source item is not cookable,
+                       or the furnace is still cooking, or the furnace became overloaded, stop loop.
                */
-               if((m_fuel_time < m_fuel_totaltime || dst_list->roomForCookedItem(src_item) == false)
-                       && (src_item == NULL || m_src_totaltime < 0.001))
+               if(src_item == NULL || !room_available || m_fuel_time < m_fuel_totaltime ||
+                       dst_list->roomForCookedItem(src_item) == false)
                {
                        m_step_accumulator = 0;
                        break;
                }
                
-               //dstream<<"Furnace is out of fuel"<<std::endl;
+               //infostream<<"Furnace is out of fuel"<<std::endl;
 
                InventoryList *fuel_list = m_inventory->getList("fuel");
                assert(fuel_list);
@@ -367,7 +455,7 @@ bool FurnaceNodeMetadata::step(float dtime)
                }
                else
                {
-                       //dstream<<"No fuel found"<<std::endl;
+                       //infostream<<"No fuel found"<<std::endl;
                        // No fuel, stop loop.
                        m_step_accumulator = 0;
                        break;