summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-03-28 01:51:25 +0300
committerAndrei Karas <akaras@inbox.ru>2013-03-28 01:51:25 +0300
commitff936ce120283ade23d88725c7d38542beca0a93 (patch)
tree5b2d26630c3a0537b0f578994d9ada7653c0cab3 /src/net/tmwa
parentc9b13ba269857de0311863bf4d4461185fe10459 (diff)
downloadmanaverse-ff936ce120283ade23d88725c7d38542beca0a93.tar.gz
manaverse-ff936ce120283ade23d88725c7d38542beca0a93.tar.bz2
manaverse-ff936ce120283ade23d88725c7d38542beca0a93.tar.xz
manaverse-ff936ce120283ade23d88725c7d38542beca0a93.zip
improve gamehandler class
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/gamehandler.cpp16
-rw-r--r--src/net/tmwa/gamehandler.h18
2 files changed, 16 insertions, 18 deletions
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index 80dc461f5..ce6fa0e14 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -88,7 +88,7 @@ void GameHandler::handleMessage(Net::MessageIn &msg)
BLOCK_END("GameHandler::handleMessage")
}
-void GameHandler::mapLoadedEvent()
+void GameHandler::mapLoadedEvent() const
{
MessageOut outMsg(CMSG_MAP_LOADED);
}
@@ -99,10 +99,8 @@ void GameHandler::connect()
return;
mNetwork->connect(mapServer);
-
- const Token &token =
- static_cast<LoginHandler*>(Net::getLoginHandler())->getToken();
-
+ const Token &token = static_cast<LoginHandler*>(
+ Net::getLoginHandler())->getToken();
if (Client::getState() == STATE_CONNECT_GAME)
{
@@ -137,7 +135,7 @@ void GameHandler::connect()
mNetwork->skip(4);
}
-bool GameHandler::isConnected()
+bool GameHandler::isConnected() const
{
if (!mNetwork)
return false;
@@ -150,18 +148,18 @@ void GameHandler::disconnect()
mNetwork->disconnect();
}
-void GameHandler::quit()
+void GameHandler::quit() const
{
MessageOut outMsg(CMSG_CLIENT_QUIT);
}
-void GameHandler::ping(int tick)
+void GameHandler::ping(const int tick) const
{
MessageOut msg(CMSG_CLIENT_PING);
msg.writeInt32(tick);
}
-void GameHandler::disconnect2()
+void GameHandler::disconnect2() const
{
MessageOut outMsg(CMSG_CLIENT_DISCONNECT);
}
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index 5ce70fbca..9a63ddaf4 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -40,23 +40,23 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler
A_DELETE_COPY(GameHandler)
- void handleMessage(Net::MessageIn &msg);
+ void handleMessage(Net::MessageIn &msg) override;
- void connect();
+ void connect() override;
- bool isConnected() A_WARN_UNUSED;
+ bool isConnected() const override A_WARN_UNUSED;
- void disconnect();
+ void disconnect() override;
- void quit();
+ void quit() const override;
- void ping(int tick);
+ void ping(const int tick) const override;
- void disconnect2();
+ void disconnect2() const override;
- void mapLoadedEvent();
+ void mapLoadedEvent() const override;
- bool mustPing() const A_WARN_UNUSED
+ bool mustPing() const override A_WARN_UNUSED
{ return false; }
};