Merge remote-tracking branch 'queatz/furnace-is-not-blackhole'

EleutherAI · Aug 30, 2011 · 1a70552 · 1a70552
2 parents 87b9e54 + ef08163
commit 1a70552
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
@@ -203,6 +203,24 @@ 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;

diff --git a/src/content_nodemeta.h b/src/content_nodemeta.h
@@ -76,6 +76,7 @@ class FurnaceNodeMetadata : public NodeMetadata
  virtual Inventory* getInventory() {return m_inventory;}
  virtual void inventoryModified();
  virtual bool step(float dtime);
+ virtual bool nodeRemovalDisabled();
  virtual std::string getInventoryDrawSpecString();
 
 private: