Use inventory_image in the first place for inventory item mesh

[minetest.git] / src / staticobject.h

diff --git a/src/staticobject.h b/src/staticobject.h
index 4918a14663eb127c5227bb824e911332755aad64..208fb2cc86caf387cf1d9292d06e650d73892a9a 100644 (file)
--- a/src/staticobject.h
+++ b/src/staticobject.h
@@ -68,8 +68,7 @@ class StaticObjectList
                        {
                                dstream<<"ERROR: StaticObjectList::insert(): "
                                                <<"id already exists"<<std::endl;
-                               assert(0);
-                               return;
+                               FATAL_ERROR("StaticObjectList::insert()");
                        }
                        m_active[id] = obj;
                }
@@ -77,10 +76,10 @@ class StaticObjectList
 
        void remove(u16 id)
        {
-               assert(id != 0);
+               assert(id != 0); // Pre-condition
                if(m_active.find(id) == m_active.end())
                {
-                       dstream<<"WARNING: StaticObjectList::remove(): id="<<id
+                       warningstream<<"StaticObjectList::remove(): id="<<id
                                        <<" not found"<<std::endl;
                        return;
                }