minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of /media/Field/Software/minetest-queatz/minetest-sqlite/.. into sqlite-map

This commit is contained in:
JacobF 2011-09-02 16:59:17 -04:00
parent 99de37ff94 ad795c9f0c
commit e3c58eff1c
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/changelog.txt
View File

@ -3,6 +3,15 @@ Minetest-c55 changelog
This should contain all the major changes. This should contain all the major changes.
For minor stuff, refer to the commit log of the repository. 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: 2011-07-31_3:
- Fixes a bug that made the server to deny non-empty passwords from players connecting the first time - Fixes a bug that made the server to deny non-empty passwords from players connecting the first time

2
src/content_nodemeta.cpp
View File

@ -293,7 +293,7 @@ bool FurnaceNodeMetadata::step(float dtime)
If there is no source item or source item is not cookable, If there is no source item or source item is not cookable,
or furnace became overloaded, stop loop. 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)) && (src_item == NULL || m_src_totaltime < 0.001))
{ {
m_step_accumulator = 0; m_step_accumulator = 0;

2
src/inventory.cpp
View File

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