diff options
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/gui/buysell.cpp | 15 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3768b7cd..ae9fa827 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,9 +32,7 @@ tmw_SOURCES = gui/widgets/avatar.cpp \ gui/button.cpp \ gui/button.h \ gui/buy.cpp \ - gui/buy.h \ - gui/buysell.cpp \ - gui/buysell.h \ + gui/buy.h \ gui/char_select.cpp \ gui/char_select.h \ gui/chat.cpp \ @@ -431,6 +429,8 @@ endif if SERVER_EATHENA tmw_CXXFLAGS += -DEATHENA_SUPPORT tmw_SOURCES += \ + gui/buysell.cpp \ + gui/buysell.h \ gui/char_server.cpp \ gui/char_server.h \ gui/skill.cpp \ diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp index 8fffd3d5..a0e2fc93 100644 --- a/src/gui/buysell.cpp +++ b/src/gui/buysell.cpp @@ -19,17 +19,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "button.h" #include "buysell.h" -#include "../npc.h" +#include "npc.h" -#include "../net/messageout.h" -#ifdef EATHENA_SUPPORT -#include "../net/ea/protocol.h" -#endif +#include "gui/button.h" -#include "../utils/gettext.h" +#include "net/messageout.h" +#include "net/ea/protocol.h" + +#include "utils/gettext.h" BuySellDialog::BuySellDialog(): Window(_("Shop")) @@ -96,9 +95,7 @@ void BuySellDialog::action(const gcn::ActionEvent &event) return; } -#ifdef EATHENA_SUPPORT MessageOut outMsg(CMSG_NPC_BUY_SELL_REQUEST); outMsg.writeInt32(current_npc); outMsg.writeInt8(action); -#endif } |