Merged 0.0 changes from revision 2825 to 2898 to trunk.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/item.h b/src/item.h
index 1375886e..47cdb1a9 100644
--- a/src/item.h
+++ b/src/item.h
@@ -24,7 +24,7 @@
 #ifndef _ITEM_H_
 #define _ITEM_H_
 
-#include "resources/itemmanager.h"
+#include "resources/itemdb.h"
 
 /**
  * Represents one or more instances of a certain item type.
@@ -119,7 +119,7 @@ class Item
          * Returns information about this item type.
          */
         const ItemInfo&
-        getInfo() const { return itemDb->getItemInfo(mId); }
+        getInfo() const { return ItemDB::get(mId); }
 
     protected:
         int mId;              /**< Item type id. */