summaryrefslogtreecommitdiff
path: root/src/gui/windows/buydialog.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-28 16:03:59 +0300
committerAndrei Karas <akaras@inbox.ru>2016-07-28 16:34:59 +0300
commitb96e6eeba6e1511568c8291bd8cb6a6d3706635c (patch)
treed021843c88d856f86f018547c30f1181290ffcbe /src/gui/windows/buydialog.cpp
parent60859a71dd9794b0216cc7a60146d417e06dbbad (diff)
downloadmv-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.tar.gz
mv-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.tar.bz2
mv-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.tar.xz
mv-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.zip
Remove define EATHENA_SUPPORT from all code.
Now eathena like support enabled always.
Diffstat (limited to 'src/gui/windows/buydialog.cpp')
-rw-r--r--src/gui/windows/buydialog.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index 9dd083d61..7c7d96a13 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -22,9 +22,7 @@
#include "gui/windows/buydialog.h"
-#ifdef EATHENA_SUPPORT
#include "actormanager.h"
-#endif
#include "configuration.h"
#include "units.h"
@@ -48,11 +46,9 @@
#include "net/adminhandler.h"
#include "net/buysellhandler.h"
-#ifdef EATHENA_SUPPORT
#include "net/cashshophandler.h"
#include "net/markethandler.h"
#include "net/vendinghandler.h"
-#endif
#include "net/serverfeatures.h"
#include "net/npchandler.h"
@@ -443,14 +439,12 @@ void BuyDialog::close()
case Nick:
case Items:
break;
-#ifdef EATHENA_SUPPORT
case Market:
marketHandler->close();
break;
case Cash:
cashShopHandler->close();
break;
-#endif
default:
buySellHandler->close();
break;
@@ -537,7 +531,6 @@ void BuyDialog::action(const ActionEvent &event)
if (mConfirmButton)
mConfirmButton->setEnabled(true);
}
-#ifdef EATHENA_SUPPORT
else if (mNpcId == fromInt(Market, BeingId))
{
marketHandler->buyItem(item->getId(),
@@ -554,7 +547,6 @@ void BuyDialog::action(const ActionEvent &event)
item->getColor(),
mAmountItems);
}
-#endif
else
{
npcHandler->buyItem(mNpcId,
@@ -567,7 +559,6 @@ void BuyDialog::action(const ActionEvent &event)
}
else if (mNpcId == fromInt(Nick, BeingId))
{
-#ifdef EATHENA_SUPPORT
if (serverFeatures->haveVending())
{
const Being *const being = actorManager->findBeingByName(
@@ -583,9 +574,6 @@ void BuyDialog::action(const ActionEvent &event)
}
}
else if (tradeWindow)
-#else
- if (tradeWindow)
-#endif
{
buySellHandler->sendBuyRequest(mNick,
item, mAmountItems);
@@ -598,13 +586,11 @@ void BuyDialog::action(const ActionEvent &event)
{
std::vector<ShopItem*> &items = mShopItems->allItems();
-#ifdef EATHENA_SUPPORT
if (mNpcId == fromInt(Market, BeingId))
{
marketHandler->buyItems(items);
}
else
-#endif
{
npcHandler->buyItems(items);
}