summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-09-11 13:31:00 +0300
committerAndrei Karas <akaras@inbox.ru>2015-09-11 13:31:24 +0300
commita5bda75dae5facec9f920af28865aae4d46b545b (patch)
treedbc227f2d9a6e06e27ade8d7cc4939d03b5efd59 /src
parentd5f9a07f8c9f0b20906480646842cd8ccbcd2f6c (diff)
downloadplus-a5bda75dae5facec9f920af28865aae4d46b545b.tar.gz
plus-a5bda75dae5facec9f920af28865aae4d46b545b.tar.bz2
plus-a5bda75dae5facec9f920af28865aae4d46b545b.tar.xz
plus-a5bda75dae5facec9f920af28865aae4d46b545b.zip
Fix compilation with disabled eathena server type.
Diffstat (limited to 'src')
-rw-r--r--src/actions/commands.cpp2
-rw-r--r--src/gui/popups/itempopup.cpp4
-rw-r--r--src/gui/popups/itempopup.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index a3238e81c..36d189399 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -519,8 +519,8 @@ impHandler(imitation)
impHandler0(sendMail)
{
- const ServerTypeT type = Net::getNetworkType();
#ifdef EATHENA_SUPPORT
+ const ServerTypeT type = Net::getNetworkType();
if (type == ServerType::EATHENA || type == ServerType::EVOL2)
{
std::string name;
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index e70de0a5c..21c00001d 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -222,7 +222,9 @@ void ItemPopup::setItem(const ItemInfo &item,
// TRANSLATORS: popup label
mItemWeight->setTextWrapped(strprintf(_("Weight: %s"),
Units::formatWeight(item.getWeight()).c_str()), 196);
+#ifdef EATHENA_SUPPORT
mItemCards->setTextWrapped(getCardsString(cards), 196);
+#endif
int minWidth = mItemName->getWidth() + space;
@@ -264,6 +266,7 @@ void ItemPopup::setItem(const ItemInfo &item,
mItemDesc->setPosition(0, 2 * height);
}
+#ifdef EATHENA_SUPPORT
std::string ItemPopup::getCardsString(const int *const cards)
{
if (!cards)
@@ -315,6 +318,7 @@ std::string ItemPopup::getCardsString(const int *const cards)
}
}
}
+#endif
#define caseSetColor(name1, name2) \
case name1: \
diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h
index fb2a935ca..43b7cb262 100644
--- a/src/gui/popups/itempopup.h
+++ b/src/gui/popups/itempopup.h
@@ -73,7 +73,9 @@ class ItemPopup final : public Popup
void resetPopup();
private:
+#ifdef EATHENA_SUPPORT
std::string getCardsString(const int *const cards);
+#endif
Label *mItemName A_NONNULLPOINTER;
TextBox *mItemDesc A_NONNULLPOINTER;