Add more to eAthena guild support

It's not complete yet, but it is closer. Also fix up handling of guild/party members.

Reviewed-by: Chuck Miller

1 files changed, 17 insertions, 7 deletions

diff --git a/src/party.h b/src/party.h
index e109d7b6..e723cf37 100644
--- a/src/party.h
+++ b/src/party.h
@@ -34,12 +34,6 @@ class Party;
 class PartyMember : public Avatar
 {
 public:
-    PartyMember(int partyId, int id, const std::string &name);
-
-    PartyMember(int partyId, int id);
-
-    PartyMember(int partyId, const std::string &name);
-
     int getID() const { return mId; }
 
     void setID(int id) { mId = id; }
@@ -53,6 +47,12 @@ public:
 protected:
     friend class Party;
 
+    PartyMember(Party *party, int id, const std::string &name);
+
+    PartyMember(Party *party, int id);
+
+    PartyMember(Party *party, const std::string &name);
+
     int mId;
     Party *mParty;
     bool mLeader;
@@ -73,7 +73,17 @@ public:
     /**
      * Adds member to the list.
      */
-    void addMember(PartyMember *member);
+    PartyMember *addMember(int id, const std::string &name);
+
+    /**
+     * Adds member to the list.
+     */
+    PartyMember *addMember(int id);
+
+    /**
+     * Adds member to the list.
+     */
+    PartyMember *addMember(const std::string &name);
 
     /**
      * Find a member by ID.