Merge branch '0.0.29'

Conflicts:
	src/gui/widgets/chattab.cpp

2 files changed, 17 insertions, 16 deletions

diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 899dd977..62bf0700 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -247,7 +247,7 @@ void ItemDB::unload()
     mLoaded = false;
 }
 
-const ItemInfo& ItemDB::get(int id)
+const ItemInfo &ItemDB::get(int id)
 {
     assert(mLoaded);
 
@@ -255,30 +255,30 @@ const ItemInfo& ItemDB::get(int id)
 
     if (i == mItemInfos.end())
     {
-        logger->log("ItemDB: Error, unknown item ID# %d", id);
+        logger->log("ItemDB: Warning, unknown item ID# %d", id);
         return *mUnknown;
     }
-    else
-    {
-        return *(i->second);
-    }
+
+    return *(i->second);
 }
 
-const ItemInfo& ItemDB::get(const std::string &name)
+const ItemInfo &ItemDB::get(const std::string &name)
 {
-    assert(mLoaded && !name.empty());
+    assert(mLoaded);
 
     NamedItemInfos::const_iterator i = mNamedItemInfos.find(name);
 
     if (i == mNamedItemInfos.end())
     {
-        logger->log("ItemDB: Error, unknown item name %s", name.c_str());
+        if (!name.empty())
+        {
+            logger->log("ItemDB: Warning, unknown item name \"%s\"",
+                        name.c_str());
+        }
         return *mUnknown;
     }
-    else
-    {
-        return *(i->second);
-    }
+
+    return *(i->second);
 }
 
 void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node)
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 3329d95b..0c87b585 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -118,6 +118,7 @@ class ItemInfo
             mType(ITEM_UNUSABLE),
             mWeight(0),
             mView(0),
+            mId(0),
             mAttackType(ACTION_DEFAULT)
         {
         }
@@ -162,10 +163,10 @@ class ItemInfo
         ItemType getType() const
         { return mType; }
 
-        void setWeight(short weight)
+        void setWeight(int weight)
         { mWeight = weight; }
 
-        short getWeight() const
+        int getWeight() const
         { return mWeight; }
 
         void setView(int view)
@@ -198,7 +199,7 @@ class ItemInfo
         std::string mEffect;         /**< Description of effects. */
         ItemType mType;              /**< Item type. */
         std::string mParticle;       /**< Particle effect used with this item */
-        short mWeight;               /**< Weight in grams. */
+        int mWeight;                 /**< Weight in grams. */
         int mView;                   /**< Item ID of how this item looks. */
         int mId;                     /**< Item ID */