Clean up eAthena party handling a bit more

1 files changed, 16 insertions, 32 deletions

diff --git a/src/net/ea/party.h b/src/net/ea/party.h
index 25af80b3..6907de47 100644
--- a/src/net/ea/party.h
+++ b/src/net/ea/party.h
@@ -22,18 +22,14 @@
 #ifndef PARTY_H
 #define PARTY_H
 
-#include <string>
-
-#include <guichan/actionlistener.hpp>
+#include "being.h"
 
-class PartyHandler;
-class Being;
-class ChatWindow;
+#include <string>
 
-class Party
+namespace eAthena
 {
-    public:
-        Party();
+    namespace Party
+    {
         void respond(const std::string &command, const std::string &args);
 
         void create(const std::string &party);
@@ -43,32 +39,20 @@ class Party
         void inviteResponse(const std::string &nick, int status);
         void invitedAsk(const std::string &nick, int gender,
                         const std::string &partyName);
+
+        /**
+         * Send invite response to the server
+         */
+        void respondToInvite(bool accept);
+
+        /**
+         * The player has left your party
+         */
         void leftResponse(const std::string &nick);
         void receiveChat(Being *being, const std::string &msg);
 
         void help(const std::string &args);
-
-    private:
-        std::string mPartyName;
-        bool mInParty;
-        bool mCreating; /**< Used to give an appropriate response to
-                          failure */
-        PartyHandler *handler;
-
-        class InviteListener : public gcn::ActionListener
-        {
-            public:
-                InviteListener(bool *inParty) :
-                    mInParty(inParty)
-                {}
-                void action(const gcn::ActionEvent &event);
-
-            private:
-                bool *mInParty;
-        };
-        InviteListener mInviteListener;
-};
-
-extern Party *playerParty;
+    }
+}
 
 #endif