diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-04-02 17:54:41 +0200 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-04-02 18:03:46 +0200 |
| commit | 44355dadbcb1927617ef6302f7cba555437b6dac (patch) | |
| tree | 29ee2aeb5fc7fdf713777ec0030839648189d896 | |
| parent | 722ea46c1e22fc8645477f6319c5099cb6066270 (diff) | |
| download | mana-44355dadbcb1927617ef6302f7cba555437b6dac.tar.gz mana-44355dadbcb1927617ef6302f7cba555437b6dac.tar.bz2 mana-44355dadbcb1927617ef6302f7cba555437b6dac.tar.xz mana-44355dadbcb1927617ef6302f7cba555437b6dac.zip | |
Partially fixed compilation for TMWServ. src/gui/buysell.cpp still needs to be fixed.
| -rw-r--r-- | src/commandhandler.cpp | 2 | ||||
| -rw-r--r-- | src/game.cpp | 2 | ||||
| -rw-r--r-- | src/gui/popupmenu.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index 03b192f9..7e177ab5 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -483,7 +483,7 @@ void CommandHandler::handleParty(const std::string &args, ChatTab *tab) void CommandHandler::handleMe(const std::string &args, ChatTab *tab) { // Net::getChatHandler()->me(args); -#ifdef TMWServ_SUPPORT +#ifdef TMWSERV_SUPPORT // TODO #else chatHandler->me(args); diff --git a/src/game.cpp b/src/game.cpp index 113c20f6..8c886793 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -365,13 +365,13 @@ Game::Game(Network *network): mBeingHandler(new BeingHandler(config.getValue("EnableSync", 0) == 1)), mEquipmentHandler(new EquipmentHandler), mSkillHandler(new SkillHandler), + mNpcHandler(new NpcHandler), #endif mPartyHandler(new PartyHandler), mBuySellHandler(new BuySellHandler), mChatHandler(new ChatHandler), mInventoryHandler(new InventoryHandler), mItemHandler(new ItemHandler), - mNpcHandler(new NpcHandler), mPlayerHandler(new PlayerHandler), mTradeHandler(new TradeHandler), mLastTarget(Being::UNKNOWN), diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 2b49ff30..37b5f8fd 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -299,7 +299,6 @@ void PopupMenu::handleLink(const std::string &link) { player_node->inviteToParty(dynamic_cast<Player*> (being)); } -#endif else if (link == "admin-kick" && being && (being->getType() == Being::PLAYER || @@ -307,6 +306,7 @@ void PopupMenu::handleLink(const std::string &link) { adminHandler->kick(being->getId()); } +#endif // Unknown actions else |