summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-04 02:29:22 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-04 02:29:22 +0300
commitc428202503a6f57e3f9381af880a6d594aca4c65 (patch)
tree242296fe51605565b8fd25470af5162c3dce0a6f
parentb94678289a5e671fc168ec58525b7aae2a56e6ec (diff)
downloadmv-c428202503a6f57e3f9381af880a6d594aca4c65.tar.gz
mv-c428202503a6f57e3f9381af880a6d594aca4c65.tar.bz2
mv-c428202503a6f57e3f9381af880a6d594aca4c65.tar.xz
mv-c428202503a6f57e3f9381af880a6d594aca4c65.zip
Fix compilation with different options.
-rw-r--r--src/CMakeLists.txt12
-rw-r--r--src/Makefile.am12
-rw-r--r--src/actions/windows.cpp4
-rw-r--r--src/gui/windows/itemamountwindow.cpp4
-rw-r--r--src/gui/windows/itemamountwindow.h2
-rw-r--r--src/inventory.cpp2
6 files changed, 24 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 82d269c5d..12517b841 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -384,12 +384,6 @@ SET(SRCS
gui/windows/killstats.h
gui/windows/logindialog.cpp
gui/windows/logindialog.h
- gui/windows/maileditwindow.cpp
- gui/windows/maileditwindow.h
- gui/windows/mailviewwindow.cpp
- gui/windows/mailviewwindow.h
- gui/windows/mailwindow.cpp
- gui/windows/mailwindow.h
gui/windows/minimap.cpp
gui/windows/minimap.h
gui/windows/ministatuswindow.cpp
@@ -1427,6 +1421,12 @@ SET(SRCS_EATHENA
gui/windows/buyingstoreselldialog.h
gui/windows/eggselectiondialog.cpp
gui/windows/eggselectiondialog.h
+ gui/windows/maileditwindow.cpp
+ gui/windows/maileditwindow.h
+ gui/windows/mailviewwindow.cpp
+ gui/windows/mailviewwindow.h
+ gui/windows/mailwindow.cpp
+ gui/windows/mailwindow.h
listeners/banklistener.cpp
listeners/banklistener.h
listeners/buyingstoremodelistener.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index d11fd78cf..6752b3b7f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -522,12 +522,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/windows/killstats.h \
gui/windows/logindialog.cpp \
gui/windows/logindialog.h \
- gui/windows/maileditwindow.cpp \
- gui/windows/maileditwindow.h \
- gui/windows/mailviewwindow.cpp \
- gui/windows/mailviewwindow.h \
- gui/windows/mailwindow.cpp \
- gui/windows/mailwindow.h \
gui/windows/minimap.cpp \
gui/windows/minimap.h \
gui/windows/ministatuswindow.cpp \
@@ -1366,6 +1360,12 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
gui/windows/buyingstoreselldialog.h \
gui/windows/eggselectiondialog.cpp \
gui/windows/eggselectiondialog.h \
+ gui/windows/maileditwindow.cpp \
+ gui/windows/maileditwindow.h \
+ gui/windows/mailviewwindow.cpp \
+ gui/windows/mailviewwindow.h \
+ gui/windows/mailwindow.cpp \
+ gui/windows/mailwindow.h \
listeners/banklistener.cpp \
listeners/banklistener.h \
listeners/buyingstoremodelistener.cpp \
diff --git a/src/actions/windows.cpp b/src/actions/windows.cpp
index 168409366..04a4b59b3 100644
--- a/src/actions/windows.cpp
+++ b/src/actions/windows.cpp
@@ -335,8 +335,12 @@ impHandler0(quickWindowShow)
impHandler0(mailWindowShow)
{
+#ifdef EATHENA_SUPPORT
showHideWindow(mailWindow);
return true;
+#else
+ return false;
+#endif
}
} // namespace Actions
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index 870d91265..f37e88c46 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -94,10 +94,12 @@ void ItemAmountWindow::finish(const Item *const item,
if (shopWindow)
shopWindow->addSellItem(item, amount, price);
break;
+#ifdef EATHENA_SUPPORT
case MailAdd:
if (mailEditWindow)
mailEditWindow->addItem(item, amount);
break;
+#endif
default:
break;
}
@@ -239,10 +241,12 @@ ItemAmountWindow::ItemAmountWindow(const Usage usage, Window *const parent,
// TRANSLATORS: amount window message
setCaption(_("Select amount of items to store."));
break;
+#ifdef EATHENA_SUPPORT
case MailAdd:
// TRANSLATORS: amount window message
setCaption(_("Select amount of items to send."));
break;
+#endif
case CartAdd:
// TRANSLATORS: amount window message
setCaption(_("Select amount of items to store to cart."));
diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h
index 92d0341e0..c371ffbaa 100644
--- a/src/gui/windows/itemamountwindow.h
+++ b/src/gui/windows/itemamountwindow.h
@@ -57,7 +57,9 @@ class ItemAmountWindow final : public Window,
ItemSplit,
ShopBuyAdd,
ShopSellAdd,
+#ifdef EATHENA_SUPPORT
MailAdd
+#endif
};
A_DELETE_COPY(ItemAmountWindow)
diff --git a/src/inventory.cpp b/src/inventory.cpp
index f2acdbeda..66de463a1 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -315,11 +315,13 @@ std::string Inventory::getName() const
// TRANSLATORS: inventory type name
return N_("Npc");
}
+#ifdef EATHENA_SUPPORT
case InventoryType::MAIL:
{
// TRANSLATORS: inventory type name
return N_("Mail");
}
+#endif
case InventoryType::TRADE:
{
// TRANSLATORS: inventory type name