diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-02-16 22:43:29 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-02-16 22:45:07 +0300 |
| commit | 940e0bbafc298553fba585e2604e9c1d0c5d37c7 (patch) | |
| tree | 600c29347a8617c314af02e3ad30bf8e578afe0e | |
| parent | c3be771906112df05821dc82539fdca2bf3d7991 (diff) | |
| download | manaverse-940e0bbafc298553fba585e2604e9c1d0c5d37c7.tar.gz manaverse-940e0bbafc298553fba585e2604e9c1d0c5d37c7.tar.bz2 manaverse-940e0bbafc298553fba585e2604e9c1d0c5d37c7.tar.xz manaverse-940e0bbafc298553fba585e2604e9c1d0c5d37c7.zip | |
Build pincodelistener only if eathena support enabled.
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gui/windows/charselectdialog.cpp | 2 | ||||
| -rw-r--r-- | src/listeners/pincodelistener.h | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f1f186b3d..3d598636e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1116,8 +1116,6 @@ SET(SRCS enums/events/mouseeventtype.h listeners/mouselistener.h listeners/openurllistener.h - listeners/pincodelistener.cpp - listeners/pincodelistener.h listeners/playerdeathlistener.cpp listeners/playerdeathlistener.h listeners/playerpostdeathlistener.h @@ -1414,6 +1412,8 @@ SET(SRCS_EATHENA listeners/buyingstoremodelistener.h listeners/buyingstoreslotslistener.cpp listeners/buyingstoreslotslistener.h + listeners/pincodelistener.cpp + listeners/pincodelistener.h net/eathena/adminhandler.cpp net/eathena/adminhandler.h net/eathena/auctionhandler.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 5a646a7bb..73c5e4bba 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -204,8 +204,6 @@ manaplus_SOURCES += events/actionevent.h \ enums/events/mouseeventtype.h \ listeners/mouselistener.h \ listeners/openurllistener.h \ - listeners/pincodelistener.cpp \ - listeners/pincodelistener.h \ listeners/playerdeathlistener.cpp \ listeners/playerdeathlistener.h \ listeners/playerpostdeathlistener.h \ @@ -1350,6 +1348,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \ listeners/buyingstoremodelistener.h \ listeners/buyingstoreslotslistener.cpp \ listeners/buyingstoreslotslistener.h \ + listeners/pincodelistener.cpp \ + listeners/pincodelistener.h \ net/eathena/adminhandler.cpp \ net/eathena/adminhandler.h \ net/eathena/auctionhandler.cpp \ diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 9e68da061..adfb46d63 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -186,6 +186,7 @@ void CharSelectDialog::postInit() { setVisible(true); requestFocus(); +#ifdef EATHENA_SUPPORT if (charServerHandler->isNeedCreatePin()) { EditDialog *const dialog = new EditDialog( @@ -193,6 +194,7 @@ void CharSelectDialog::postInit() dialog->postInit(); dialog->addActionListener(&pincodeListener); } +#endif } void CharSelectDialog::action(const ActionEvent &event) diff --git a/src/listeners/pincodelistener.h b/src/listeners/pincodelistener.h index cb8f75be3..4d3881c7c 100644 --- a/src/listeners/pincodelistener.h +++ b/src/listeners/pincodelistener.h @@ -21,6 +21,8 @@ #ifndef LISTENERS_PINCODELISTENER_H #define LISTENERS_PINCODELISTENER_H +#ifdef EATHENA_SUPPORT + #include "listeners/actionlistener.h" #include "localconsts.h" @@ -33,4 +35,5 @@ class PincodeListener final : public ActionListener extern PincodeListener pincodeListener; +#endif // EATHENA_SUPPORT #endif // LISTENERS_PINCODELISTENER_H |