Merge branch 'master' of /media/Field/Software/minetest-queatz/minete…

…st-sqlite/.. into sqlite-map

doc/changelog.txt

@@ -3,6 +3,15 @@ Minetest-c55 changelog
 This should contain all the major changes.
 For minor stuff, refer to the commit log of the repository.
 
+X:
+- Ladders
+- Lava
+- /me chat command
+- Slightly better looking inventory (transparency)
+- Fix the long-existed PeerNotFound loop bug
+- Some translations and localization-related fixes
+- Lots of small fixes, once again
+
 2011-07-31_3:
 - Fixes a bug that made the server to deny non-empty passwords from players connecting the first time
 

src/content_nodemeta.cpp

@@ -293,7 +293,7 @@ bool FurnaceNodeMetadata::step(float dtime)
  If there is no source item or source item is not cookable,
  or furnace became overloaded, stop loop.
  */
- if((m_fuel_time < m_fuel_totaltime || dst_list->roomForCookedItem(src_item) == false)
+ if((m_fuel_time < m_fuel_totaltime || (src_item && dst_list->roomForCookedItem(src_item) == false))
  && (src_item == NULL || m_src_totaltime < 0.001))
  {
  m_step_accumulator = 0;

src/inventory.cpp

@@ -581,6 +581,8 @@ bool InventoryList::roomForItem(const InventoryItem *item)
 
 bool InventoryList::roomForCookedItem(const InventoryItem *item)
 {
+ if(!item)
+ return false;
  const InventoryItem *cook = item->createCookResult();
  if(!cook)
  return false;