summaryrefslogtreecommitdiff
path: root/src/gui/popupmenu.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-05-06 18:03:52 +0300
committerAndrei Karas <akaras@inbox.ru>2012-05-06 20:52:08 +0300
commitf0ae9007f666580259ca8c120f7aaee58a63f85a (patch)
treefebc9da1d2ee1a5d3f85096727cd8c26d036ea5e /src/gui/popupmenu.cpp
parentf7c9165e0f59a33404a486c0b154a2c21ed9a9fa (diff)
downloadmanaverse-f0ae9007f666580259ca8c120f7aaee58a63f85a.tar.gz
manaverse-f0ae9007f666580259ca8c120f7aaee58a63f85a.tar.bz2
manaverse-f0ae9007f666580259ca8c120f7aaee58a63f85a.tar.xz
manaverse-f0ae9007f666580259ca8c120f7aaee58a63f85a.zip
Fix code style.
Diffstat (limited to 'src/gui/popupmenu.cpp')
-rw-r--r--src/gui/popupmenu.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index e2009ee28..eb57dd845 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -1806,8 +1806,6 @@ void PopupMenu::showItemPopup(int x, int y, Item *item)
void PopupMenu::showDropPopup(int x, int y, Item *item)
{
mItem = item;
- mItemId = item->getId();
- mItemColor = item->getColor();
mX = x;
mY = y;
mNick = "";
@@ -1815,6 +1813,9 @@ void PopupMenu::showDropPopup(int x, int y, Item *item)
if (item)
{
+ mItemId = item->getId();
+ mItemColor = item->getColor();
+
if (item->isEquipment())
{
if (item->isEquipped())
@@ -2151,7 +2152,7 @@ void PopupMenu::addBuySellDefault()
}
}
-void PopupMenu::addParty(const std::string partyName)
+void PopupMenu::addParty(const std::string &partyName)
{
if (player_node->isInParty())
{