Revert "Merge branch 'master' of https://github.com/neckkola/Server"

This reverts commit 1826830637, reversing
changes made to 7c1a139991.
This commit is contained in:
neckkola
2022-05-18 19:03:37 -03:00
parent 1826830637
commit 4c644600b0
24 changed files with 535 additions and 3793 deletions
-11
View File
@@ -88,10 +88,6 @@ struct RaidMember{
bool IsGroupLeader;
bool IsRaidLeader;
bool IsLooter;
#ifdef BOTS
bool IsBot = false;
bool IsRaidMainAssistOne = false;
#endif
};
struct GroupMentor {
@@ -116,11 +112,6 @@ public:
bool IsRaid() { return true; }
void AddMember(Client *c, uint32 group = 0xFFFFFFFF, bool rleader=false, bool groupleader=false, bool looter=false);
#ifdef BOTS
void AddBot(Bot* b, uint32 group = 0xFFFFFFFF, bool rleader=false, bool groupleader=false, bool looter=false);
void RaidBotGroupSay(Bot* b, uint8 language, uint8 lang_skill, const char* msg, ...); //Not yet implemented
Mob* GetRaidMainAssistOneByName(const char* name);
#endif
void RemoveMember(const char *c);
void DisbandRaid();
void MoveMember(const char *name, uint32 newGroup);
@@ -130,7 +121,6 @@ public:
bool IsGroupLeader(const char *who);
bool IsRaidMember(const char *name);
void UpdateLevel(const char *name, int newLevel);
uint32 GetFreeGroup();
uint8 GroupCount(uint32 gid);
@@ -251,7 +241,6 @@ public:
bool DoesAnyMemberHaveExpeditionLockout(const std::string& expedition_name, const std::string& event_name, int max_check_count = 0);
std::vector<RaidMember> GetMembers() const;
std::vector<RaidMember> GetRaidGroupMembers(uint32 gid);
RaidMember members[MAX_RAID_MEMBERS];
char leadername[64];