summaryrefslogtreecommitdiff
path: root/src/gui/itempopup.h
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-03-30 07:19:36 -0600
committerJared Adams <jaxad0127@gmail.com>2009-03-30 07:19:36 -0600
commit2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a (patch)
tree49fb5a1e363584800f967a4a163fb3e746228722 /src/gui/itempopup.h
parentbbf4d657e77fd39887b9941af1fe75a5ec27d988 (diff)
downloadmana-client-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.tar.gz
mana-client-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.tar.bz2
mana-client-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.tar.xz
mana-client-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.zip
Merge item types to remove more #ifdefs
Diffstat (limited to 'src/gui/itempopup.h')
-rw-r--r--src/gui/itempopup.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 0e386ef7..37f6f81b 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -72,12 +72,12 @@ class ItemPopup : public Popup
TextBox *mItemDesc;
TextBox *mItemEffect;
TextBox *mItemWeight;
- std::string mItemType;
+ short mItemType;
ScrollArea *mItemDescScroll;
ScrollArea *mItemEffectScroll;
ScrollArea *mItemWeightScroll;
- static gcn::Color getColor(const std::string &type);
+ static gcn::Color getColor(short type);
};
#endif // ITEMPOPUP_H