summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-03-27 00:10:16 +0300
committerAndrei Karas <akaras@inbox.ru>2013-03-27 00:10:16 +0300
commit18d8872333e2e433ce7b9e7be71706de37933097 (patch)
treedea07c5b7dcd29a3105b42b64ce0414e45f36b10 /src/net/eathena
parent170b469cbcf4adcd82604a6b2efd5a0630ef3fb5 (diff)
downloadManaVerse-18d8872333e2e433ce7b9e7be71706de37933097.tar.gz
ManaVerse-18d8872333e2e433ce7b9e7be71706de37933097.tar.bz2
ManaVerse-18d8872333e2e433ce7b9e7be71706de37933097.tar.xz
ManaVerse-18d8872333e2e433ce7b9e7be71706de37933097.zip
improve some network handlers classes.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/adminhandler.h10
-rw-r--r--src/net/eathena/beinghandler.cpp11
-rw-r--r--src/net/eathena/beinghandler.h10
-rw-r--r--src/net/eathena/buysellhandler.cpp2
-rw-r--r--src/net/eathena/buysellhandler.h2
5 files changed, 11 insertions, 24 deletions
diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h
index cbbb9d374..9efc4acf5 100644
--- a/src/net/eathena/adminhandler.h
+++ b/src/net/eathena/adminhandler.h
@@ -40,15 +40,15 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler
A_DELETE_COPY(AdminHandler)
- void handleMessage(Net::MessageIn &msg);
+ void handleMessage(Net::MessageIn &msg) override;
- void announce(const std::string &text) const;
+ void announce(const std::string &text) const override;
- void localAnnounce(const std::string &text) const;
+ void localAnnounce(const std::string &text) const override;
- void hide(const bool h) const;
+ void hide(const bool h) const override;
- void kick(const int playerId) const;
+ void kick(const int playerId) const override;
};
} // namespace EAthena
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 8f012b2f1..98c24559a 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -835,15 +835,4 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg,
}
-void BeingHandler::processBeingSpawn(Net::MessageIn &msg)
-{
- // skipping this packet
- mSpawnId = msg.readInt32(); // id
- msg.readInt16(); // speed
- msg.readInt16(); // opt1
- msg.readInt16(); // opt2
- msg.readInt16(); // option
- msg.readInt16(); // disguise
-}
-
} // namespace EAthena
diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h
index ac266f3b7..360d8ca2b 100644
--- a/src/net/eathena/beinghandler.h
+++ b/src/net/eathena/beinghandler.h
@@ -40,16 +40,14 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
A_DELETE_COPY(BeingHandler)
- virtual void handleMessage(Net::MessageIn &msg);
+ virtual void handleMessage(Net::MessageIn &msg) override;
- virtual void requestNameById(const int id) const;
+ virtual void requestNameById(const int id) const override;
- virtual void undress(Being *const being) const;
+ virtual void undress(Being *const being) const override;
void processBeingVisibleOrMove(Net::MessageIn &msg,
- const bool visible);
-
- void processBeingSpawn(Net::MessageIn &msg);
+ const bool visible) override;
protected:
virtual void processBeingChangeLook(Net::MessageIn &msg,
diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp
index fff2e2cef..b96d2c382 100644
--- a/src/net/eathena/buysellhandler.cpp
+++ b/src/net/eathena/buysellhandler.cpp
@@ -117,7 +117,7 @@ void BuySellHandler::processNpcBuy(Net::MessageIn &msg)
}
}
-void BuySellHandler::processNpcSellResponse(Net::MessageIn &msg)
+void BuySellHandler::processNpcSellResponse(Net::MessageIn &msg) const
{
switch (msg.readInt8())
{
diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h
index c7bc5736c..0a1042174 100644
--- a/src/net/eathena/buysellhandler.h
+++ b/src/net/eathena/buysellhandler.h
@@ -43,7 +43,7 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler
virtual void processNpcBuy(Net::MessageIn &msg);
- virtual void processNpcSellResponse(Net::MessageIn &msg);
+ virtual void processNpcSellResponse(Net::MessageIn &msg) const;
};
} // namespace EAthena