summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-04-01 11:46:56 -0600
committerJared Adams <jaxad0127@gmail.com>2009-04-01 11:46:56 -0600
commit6ef22b50f3d0c2410af5bd2543bedc0b3d692f83 (patch)
tree9c249e862e45b5ef23519638f82d7ba50f553b68
parenta0e51612ccfac519890dca4afea38e5478211fec (diff)
downloadmana-client-6ef22b50f3d0c2410af5bd2543bedc0b3d692f83.tar.gz
mana-client-6ef22b50f3d0c2410af5bd2543bedc0b3d692f83.tar.bz2
mana-client-6ef22b50f3d0c2410af5bd2543bedc0b3d692f83.tar.xz
mana-client-6ef22b50f3d0c2410af5bd2543bedc0b3d692f83.zip
Some cleanup
-rw-r--r--src/beingmanager.cpp5
-rw-r--r--src/channel.cpp3
-rw-r--r--src/gui/popupmenu.cpp8
-rw-r--r--src/gui/widgets/channeltab.cpp3
4 files changed, 3 insertions, 16 deletions
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index 8c07aaab..b8acb7c2 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -26,10 +26,7 @@
#include "npc.h"
#include "player.h"
-#ifdef EATHENA_SUPPORT
-#include "net/messageout.h"
-#include "net/ea/protocol.h"
-#else
+#ifdef TMWSERV_SUPPORT
#include "net/tmwserv/protocol.h"
#endif
diff --git a/src/channel.cpp b/src/channel.cpp
index 3e4646fb..1f9bde2b 100644
--- a/src/channel.cpp
+++ b/src/channel.cpp
@@ -24,9 +24,6 @@
#ifdef TMWSERV_SUPPORT
#include "net/tmwserv/chatserver/chatserver.h"
#include "net/tmwserv/gameserver/player.h"
-#else
-#include "net/messageout.h"
-#include "net/ea/protocol.h"
#endif
Channel::Channel(short id,
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 41e266a5..8bb6acbb 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -35,11 +35,6 @@
#include "npc.h"
#include "player_relations.h"
-#ifdef EATHENA_SUPPORT
-#include "net/messageout.h"
-#include "net/ea/protocol.h"
-#endif
-
#include "resources/itemdb.h"
#include "resources/iteminfo.h"
@@ -292,8 +287,7 @@ void PopupMenu::handleLink(const std::string &link)
being &&
being->getType() == Being::PLAYER)
{
- MessageOut outMsg(CMSG_PARTY_INVITE);
- outMsg.writeInt32(being->getId());
+ player_node->inviteToParty(dynamic_cast<Player*> (being));
}
#endif
diff --git a/src/gui/widgets/channeltab.cpp b/src/gui/widgets/channeltab.cpp
index 375ead26..6425293c 100644
--- a/src/gui/widgets/channeltab.cpp
+++ b/src/gui/widgets/channeltab.cpp
@@ -27,8 +27,7 @@
#include "net/tmwserv/chatserver/chatserver.h"
#include "net/tmwserv/gameserver/player.h"
#else
-#include "net/messageout.h"
-#include "net/ea/protocol.h"
+
#endif
ChannelTab::ChannelTab(Channel *channel) : ChatTab(channel->getName()),