Mgv5/v7/flat/fractal: Move tunnel noise calculation into generateCaves

[minetest.git] / src / serverobject.cpp

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index 9cf817859a855d0a1656dc29eff219d98f16c2df..236d7e8dc06feaaca81fedb4c3479fc87ed3d103 100644 (file)
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -52,7 +52,7 @@ ServerActiveObject* ServerActiveObject::create(ActiveObjectType type,
                }
 
                // If factory is not found, just return.
-               dstream<<"WARNING: ServerActiveObject: No factory for type="
+               warningstream<<"ServerActiveObject: No factory for type="
                                <<type<<std::endl;
                return NULL;
        }
@@ -90,14 +90,9 @@ ItemStack ServerActiveObject::getWieldedItem() const
 
 bool ServerActiveObject::setWieldedItem(const ItemStack &item)
 {
-       Inventory *inv = getInventory();
-       if(inv)
-       {
-               InventoryList *list = inv->getList(getWieldList());
-               if (list)
-               {
+       if(Inventory *inv = getInventory()) {
+               if (InventoryList *list = inv->getList(getWieldList())) {
                        list->changeItem(getWieldIndex(), item);
-                       setInventoryModified();
                        return true;
                }
        }