diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gui/buysell.cpp | 2 | ||||
| -rw-r--r-- | src/gui/itemcontainer.cpp | 2 | ||||
| -rw-r--r-- | src/gui/itemshortcutcontainer.cpp | 2 | ||||
| -rw-r--r-- | src/gui/palette.cpp | 2 | ||||
| -rw-r--r-- | src/gui/palette.h | 2 | ||||
| -rw-r--r-- | src/gui/setup_colors.cpp | 2 |
8 files changed, 14 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b67b81e9..e7566b20 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,7 +11,8 @@ FIND_PACKAGE(PNG REQUIRED) SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"") -SET(FLAGS "${FLAGS} -DTMW_DATADIR=\\\"${PKG_DATADIR}/\\\"") +SET(FLAGS "${FLAGS} -DPKG_DATADIR=\\\"${PKG_DATADIR}/\\\"") +SET(FLAGS "${FLAGS} -DLOCALEDIR=\\\"${LOCALEDIR}/\\\"") SET(FLAGS_EA "${FLAGS} -DEATHENA_SUPPORT") SET(FLAGS_TMW "${FLAGS} -DTMWSERV_SUPPORT") @@ -501,6 +502,8 @@ SET(SRCS_TMW net/tmwserv/gameserver/internal.h net/tmwserv/gameserver/player.cpp net/tmwserv/gameserver/player.h + net/tmwserv/adminhandler.cpp + net/tmwserv/adminhandler.h net/tmwserv/beinghandler.cpp net/tmwserv/beinghandler.h net/tmwserv/buysellhandler.cpp @@ -525,6 +528,8 @@ SET(SRCS_TMW net/tmwserv/loginhandler.h net/tmwserv/logouthandler.cpp net/tmwserv/logouthandler.h + net/tmwserv/maphandler.cpp + net/tmwserv/maphandler.h net/tmwserv/network.cpp net/tmwserv/network.h net/tmwserv/npchandler.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 5fa55bc0..d84c792e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,6 +33,8 @@ tmw_SOURCES = gui/widgets/avatar.cpp \ gui/button.h \ gui/buy.cpp \ gui/buy.h \ + gui/buysell.cpp \ + gui/buysell.h \ gui/char_select.cpp \ gui/char_select.h \ gui/chat.cpp \ @@ -448,8 +450,6 @@ 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 80e2cdfe..16d9d2ee 100644 --- a/src/gui/buysell.cpp +++ b/src/gui/buysell.cpp @@ -86,7 +86,7 @@ void BuySellDialog::action(const gcn::ActionEvent &event) } else if (event.getId() == "Sell") { - Net::getNpcHandler()->buy(current_npc); + Net::getNpcHandler()->sell(current_npc); } else if (event.getId() == "Cancel") { diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp index 4dac0b25..7420cc18 100644 --- a/src/gui/itemcontainer.cpp +++ b/src/gui/itemcontainer.cpp @@ -131,7 +131,7 @@ void ItemContainer::draw(gcn::Graphics *graphics) caption = "(Eq)"; if (item->isEquipped()) - g->setColor(guiPalette->getColor(Palette::ITEM_EQUIPED)); + g->setColor(guiPalette->getColor(Palette::ITEM_EQUIPPED)); g->drawText(caption, itemX + BOX_WIDTH / 2, itemY + BOX_HEIGHT - 14, gcn::Graphics::CENTER); } diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp index f66aa84d..ce9013aa 100644 --- a/src/gui/itemshortcutcontainer.cpp +++ b/src/gui/itemshortcutcontainer.cpp @@ -114,7 +114,7 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics) g->drawImage(image, itemX, itemY); if (item->isEquipped()) - g->setColor(guiPalette->getColor(Palette::ITEM_EQUIPED)); + g->setColor(guiPalette->getColor(Palette::ITEM_EQUIPPED)); g->drawText(caption, itemX + mBoxWidth / 2, itemY + mBoxHeight - 14, gcn::Graphics::CENTER); } diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp index 5526e802..329a4a29 100644 --- a/src/gui/palette.cpp +++ b/src/gui/palette.cpp @@ -90,7 +90,7 @@ Palette::Palette() : addColor(HIGHLIGHT, 0xebc873, STATIC, _("Highlight"), 'H'); addColor(TAB_HIGHLIGHT, 0xff0000, PULSE, indent + _("Tab Highlight")); addColor(SHOP_WARNING, 0x910000, STATIC, indent + _("Item too expensive")); - addColor(ITEM_EQUIPED, 0x000091, STATIC, indent + _("Item is equiped")); + addColor(ITEM_EQUIPPED, 0x000091, STATIC, indent + _("Item is equipped")); addColor(CHAT, 0x000000, STATIC, _("Chat"), 'C'); addColor(GM, 0xff0000, STATIC, indent + _("GM"), 'G'); diff --git a/src/gui/palette.h b/src/gui/palette.h index 60f4ca8d..222b4256 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -58,7 +58,7 @@ class Palette : public gcn::ListModel ENTRY(HIGHLIGHT)\ ENTRY(TAB_HIGHLIGHT)\ ENTRY(SHOP_WARNING)\ - ENTRY(ITEM_EQUIPED)\ + ENTRY(ITEM_EQUIPPED)\ ENTRY(CHAT)\ ENTRY(GM)\ ENTRY(PLAYER)\ diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp index fdc2416f..77e726f8 100644 --- a/src/gui/setup_colors.cpp +++ b/src/gui/setup_colors.cpp @@ -237,7 +237,7 @@ void Setup_Colors::action(const gcn::ActionEvent &event) mPreview->addRow(msg); break; - case Palette::ITEM_EQUIPED: + case Palette::ITEM_EQUIPPED: mTextPreview->setTextColor(col); mTextPreview->setOutline(false); mTextPreview->setShadow(false); |