From 44355dadbcb1927617ef6302f7cba555437b6dac Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <crush@themanaworld.org>
Date: Thu, 2 Apr 2009 17:54:41 +0200
Subject: Partially fixed compilation for TMWServ. src/gui/buysell.cpp still
 needs to be fixed.

---
 src/commandhandler.cpp | 2 +-
 src/game.cpp           | 2 +-
 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
-- 
cgit v1.2.3-70-g09d2