diff options
Diffstat (limited to 'src/net')
-rw-r--r-- | src/net/ea/beinghandler.h | 5 | ||||
-rw-r--r-- | src/net/ea/charserverhandler.h | 4 | ||||
-rw-r--r-- | src/net/ea/inventoryhandler.h | 4 | ||||
-rw-r--r-- | src/net/ea/loginhandler.h | 4 | ||||
-rw-r--r-- | src/net/ea/npchandler.h | 4 | ||||
-rw-r--r-- | src/net/loginhandler.h | 8 | ||||
-rw-r--r-- | src/net/messagehandler.h | 10 |
7 files changed, 20 insertions, 19 deletions
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h index ad57e128e..c27d7c2da 100644 --- a/src/net/ea/beinghandler.h +++ b/src/net/ea/beinghandler.h @@ -31,11 +31,11 @@ namespace Ea class BeingHandler : public Net::BeingHandler { public: - explicit BeingHandler(const bool enableSync); - A_DELETE_COPY(BeingHandler) protected: + explicit BeingHandler(const bool enableSync); + virtual Being *createBeing(int id, int16_t job) const A_WARN_UNUSED; virtual void setSprite(Being *const being, const unsigned int slot, @@ -94,7 +94,6 @@ class BeingHandler : public Net::BeingHandler virtual void processPvpSet(Net::MessageIn &msg) const; - protected: // Should we honor server "Stop Walking" packets bool mSync; int mSpawnId; diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h index 83da865a1..01012353f 100644 --- a/src/net/ea/charserverhandler.h +++ b/src/net/ea/charserverhandler.h @@ -38,8 +38,6 @@ class Network; class CharServerHandler : public Net::CharServerHandler { public: - CharServerHandler(); - A_DELETE_COPY(CharServerHandler) virtual void setCharSelectDialog(CharSelectDialog *const window) @@ -85,6 +83,8 @@ class CharServerHandler : public Net::CharServerHandler virtual void clear() override; protected: + CharServerHandler(); + virtual void readPlayerData(Net::MessageIn &msg, Net::Character *const character, const bool withColors) const = 0; diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index eade97b6e..fa255e213 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -146,8 +146,6 @@ class InventoryHandler : public Net::InventoryHandler CART }; - InventoryHandler(); - A_DELETE_COPY(InventoryHandler) ~InventoryHandler(); @@ -208,6 +206,8 @@ class InventoryHandler : public Net::InventoryHandler { return mStorage; } protected: + InventoryHandler(); + EquipBackend mEquips; InventoryItems mInventoryItems; Inventory *mStorage; diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h index e6dadac2e..05d819ffe 100644 --- a/src/net/ea/loginhandler.h +++ b/src/net/ea/loginhandler.h @@ -38,8 +38,6 @@ namespace Ea class LoginHandler : public Net::LoginHandler { public: - LoginHandler(); - A_DELETE_COPY(LoginHandler) ~LoginHandler(); @@ -92,6 +90,8 @@ class LoginHandler : public Net::LoginHandler virtual void processServerVersion(Net::MessageIn &msg) = 0; protected: + LoginHandler(); + virtual void sendLoginRegister(const std::string &username, const std::string &password, const std::string &email) const = 0; diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h index 714bc594c..21fd35629 100644 --- a/src/net/ea/npchandler.h +++ b/src/net/ea/npchandler.h @@ -34,8 +34,6 @@ namespace Ea class NpcHandler : public Net::NpcHandler { public: - NpcHandler(); - A_DELETE_COPY(NpcHandler) void sendLetter(int npcId, const std::string &recipient, @@ -61,6 +59,8 @@ class NpcHandler : public Net::NpcHandler void processNpcStrInput(Net::MessageIn &msg); protected: + NpcHandler(); + NpcDialog *mDialog; }; diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h index d3bbdddb7..019e9b846 100644 --- a/src/net/loginhandler.h +++ b/src/net/loginhandler.h @@ -103,15 +103,15 @@ class LoginHandler virtual void clearWorlds() = 0; + virtual ~LoginHandler() + { } + + protected: LoginHandler() : mServer() { } - virtual ~LoginHandler() - { } - - protected: ServerInfo mServer; }; diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h index c438ed679..497934bd8 100644 --- a/src/net/messagehandler.h +++ b/src/net/messagehandler.h @@ -42,15 +42,17 @@ class MessageHandler virtual void handleMessage(MessageIn &msg) = 0; - MessageHandler() : - handledMessages(nullptr) - { - } A_DELETE_COPY(MessageHandler) virtual ~MessageHandler() { } + + protected: + MessageHandler() : + handledMessages(nullptr) + { + } }; } // namespace Net |