mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-31 09:06:46 +00:00
Merge branch 'master' of https://github.com/EQEmu/Server
This commit is contained in:
+3
-2
@@ -64,6 +64,7 @@ struct Item_Struct;
|
||||
#include <float.h>
|
||||
#include <set>
|
||||
#include <algorithm>
|
||||
#include <memory>
|
||||
|
||||
|
||||
#define CLIENT_TIMEOUT 90000
|
||||
@@ -201,7 +202,7 @@ struct ClientReward
|
||||
|
||||
class ClientFactory {
|
||||
public:
|
||||
Client *MakeClient(EQStream* ieqs);
|
||||
Client *MakeClient(std::shared_ptr<EQStream> ieqs);
|
||||
};
|
||||
|
||||
class Client : public Mob
|
||||
@@ -1138,7 +1139,7 @@ public:
|
||||
void HandleLFGuildResponse(ServerPacket *pack);
|
||||
void SendLFGuildStatus();
|
||||
void SendGuildLFGuildStatus();
|
||||
inline bool XTargettingAvailable() const { return ((ClientVersionBit & BIT_UnderfootAndLater) && RuleB(Character, EnableXTargetting)); }
|
||||
inline bool XTargettingAvailable() const { return ((ClientVersionBit & BIT_UFAndLater) && RuleB(Character, EnableXTargetting)); }
|
||||
inline uint8 GetMaxXTargets() const { return MaxXTargets; }
|
||||
void SetMaxXTargets(uint8 NewMax);
|
||||
bool IsXTarget(const Mob *m) const;
|
||||
|
||||
Reference in New Issue
Block a user