summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-04-30 03:31:21 +0300
committerAndrei Karas <akaras@inbox.ru>2011-04-30 03:31:36 +0300
commit6a4423541d83e23614738d685add03fa8047eb34 (patch)
tree3bbc6cb37a4af52d22438a390cc7ae6872dd330d /src
parent4d3bafdeb5a57f82487c14fded48dcfece98ae4c (diff)
downloadmv-6a4423541d83e23614738d685add03fa8047eb34.tar.gz
mv-6a4423541d83e23614738d685add03fa8047eb34.tar.bz2
mv-6a4423541d83e23614738d685add03fa8047eb34.tar.xz
mv-6a4423541d83e23614738d685add03fa8047eb34.zip
Fix compilation for windows.
Diffstat (limited to 'src')
-rw-r--r--src/gui/popupmenu.cpp2
-rw-r--r--src/gui/socialwindow.cpp2
-rw-r--r--src/gui/widgets/avatarlistbox.cpp2
-rw-r--r--src/map.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index ad0cb275f..e81a7ebbb 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -1730,7 +1730,7 @@ void PopupMenu::showAttackMonsterPopup(int x, int y, std::string name,
"@@attack remove|%s@@", _("Remove")));
break;
}
- case MapItem::IGNORE:
+ case MapItem::IGNORE_:
mBrowserBox->addRow(strprintf(
"@@attack remove|%s@@", _("Remove")));
break;
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index d25ca209d..2276f60e0 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -914,7 +914,7 @@ public:
Avatar *ava = new Avatar(name);
ava->setOnline(false);
ava->setLevel(level);
- ava->setType(MapItem::IGNORE);
+ ava->setType(MapItem::IGNORE_);
ava->setX(0);
ava->setY(0);
avatars->push_back(ava);
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 8ad6fff2e..c1025e66d 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -327,7 +327,7 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event)
}
case MapItem::ATTACK:
case MapItem::PRIORITY:
- case MapItem::IGNORE:
+ case MapItem::IGNORE_:
{
std::string name;
if (model->getAvatarAt(selected)->getLevel() == 0)
diff --git a/src/map.h b/src/map.h
index 135db5da4..1116fef4d 100644
--- a/src/map.h
+++ b/src/map.h
@@ -587,7 +587,7 @@ class MapItem
MUSIC = 9,
ATTACK = 10,
PRIORITY = 11,
- IGNORE = 12,
+ IGNORE_ = 12,
SEPARATOR = 13
};