summaryrefslogtreecommitdiff
path: root/src/item.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-12-11 15:47:35 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-12-11 15:47:35 +0000
commit8da32105732949b4b0273c718d118bcfae70a1c9 (patch)
tree0a354974d48268cfaafcdb1e06b498fa26a59c1e /src/item.h
parentf9ce4e302cb3ed203d89a7a18e10b7ad4f11519c (diff)
downloadmana-8da32105732949b4b0273c718d118bcfae70a1c9.tar.gz
mana-8da32105732949b4b0273c718d118bcfae70a1c9.tar.bz2
mana-8da32105732949b4b0273c718d118bcfae70a1c9.tar.xz
mana-8da32105732949b4b0273c718d118bcfae70a1c9.zip
Merged 0.0 changes from revision 2825 to 2898 to trunk.
Diffstat (limited to 'src/item.h')
-rw-r--r--src/item.h4
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. */