summaryrefslogtreecommitdiff
path: root/src/resources/iteminfo.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-09-23 23:47:32 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-09-23 23:47:32 +0000
commit7ca971f04907031b80ffbcb159e5af2f595e3af8 (patch)
treec7f0f210325acb35f63071797407d266ba7e9e35 /src/resources/iteminfo.h
parentc3d7827d18b725d2dff94e08a17474d607bb43dd (diff)
downloadmana-7ca971f04907031b80ffbcb159e5af2f595e3af8.tar.gz
mana-7ca971f04907031b80ffbcb159e5af2f595e3af8.tar.bz2
mana-7ca971f04907031b80ffbcb159e5af2f595e3af8.tar.xz
mana-7ca971f04907031b80ffbcb159e5af2f595e3af8.zip
Merged most of the changes in biggeruniverse's second memory cleanup patch.
Diffstat (limited to 'src/resources/iteminfo.h')
-rw-r--r--src/resources/iteminfo.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index f634025f..937911af 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -31,13 +31,14 @@
*/
class ItemInfo
{
+ friend class ItemManager;
+
public:
/**
* Constructor.
*/
ItemInfo();
-
void setImage(short image);
short getImage();
@@ -70,21 +71,18 @@ class ItemInfo
char getSlot();
-
protected:
/**
* Destructor.
*/
~ItemInfo();
-
+
short image, art;
std::string name;
std::string description;
std::string effect;
short type, weight;
char slot;
-
-
};
#endif