summaryrefslogtreecommitdiff
path: root/src/resources/iteminfo.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/resources/iteminfo.h
parentf9ce4e302cb3ed203d89a7a18e10b7ad4f11519c (diff)
downloadmana-client-8da32105732949b4b0273c718d118bcfae70a1c9.tar.gz
mana-client-8da32105732949b4b0273c718d118bcfae70a1c9.tar.bz2
mana-client-8da32105732949b4b0273c718d118bcfae70a1c9.tar.xz
mana-client-8da32105732949b4b0273c718d118bcfae70a1c9.zip
Merged 0.0 changes from revision 2825 to 2898 to trunk.
Diffstat (limited to 'src/resources/iteminfo.h')
-rw-r--r--src/resources/iteminfo.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 9a04bb2e..e4f851bb 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -33,8 +33,6 @@ class Image;
*/
class ItemInfo
{
- friend class ItemManager;
-
public:
/**
* Constructor.
@@ -49,6 +47,11 @@ class ItemInfo
{
}
+ /**
+ * Destructor.
+ */
+ ~ItemInfo();
+
void
setArt(short art) { mArt = art; }
@@ -101,11 +104,6 @@ class ItemInfo
getSlot() const { return mSlot; }
protected:
- /**
- * Destructor.
- */
- ~ItemInfo();
-
std::string mImageName;
/* TODO (BL): I do not think the item info should keep a reference to