summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-10 18:53:53 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-10 18:53:53 +0300
commit919d790980be710ec991af3654521225e97b5f79 (patch)
tree0d09d6d430502488fde4bd0841d8d5767af7d4f4 /src/net/ea
parenta3635c94a9f1074736f243b0f7de7ab1c8aa14d0 (diff)
downloadmv-919d790980be710ec991af3654521225e97b5f79.tar.gz
mv-919d790980be710ec991af3654521225e97b5f79.tar.bz2
mv-919d790980be710ec991af3654521225e97b5f79.tar.xz
mv-919d790980be710ec991af3654521225e97b5f79.zip
improve playerhandler class.
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/playerhandler.cpp44
-rw-r--r--src/net/ea/playerhandler.h35
2 files changed, 38 insertions, 41 deletions
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 655d6be60..72de30304 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -54,7 +54,7 @@ namespace
/**
* Listener used for handling the overweigth message.
*/
- struct WeightListener : public gcn::ActionListener
+ struct WeightListener final : public gcn::ActionListener
{
void action(const gcn::ActionEvent &event A_UNUSED)
{
@@ -65,7 +65,7 @@ namespace
/**
* Listener used for handling death message.
*/
- struct DeathListener : public gcn::ActionListener
+ struct DeathListener final : public gcn::ActionListener
{
void action(const gcn::ActionEvent &event A_UNUSED)
{
@@ -144,20 +144,17 @@ PlayerHandler::PlayerHandler()
{
}
-void PlayerHandler::decreaseAttribute(int attr A_UNUSED)
+void PlayerHandler::decreaseAttribute(const int attr A_UNUSED) const
{
- // Supported by eA?
}
void PlayerHandler::ignorePlayer(const std::string &player A_UNUSED,
- bool ignore A_UNUSED)
+ const bool ignore A_UNUSED) const
{
- // TODO
}
-void PlayerHandler::ignoreAll(bool ignore A_UNUSED)
+void PlayerHandler::ignoreAll(const bool ignore A_UNUSED) const
{
- // TODO
}
bool PlayerHandler::canCorrectAttributes() const
@@ -172,7 +169,7 @@ Vector PlayerHandler::getDefaultWalkSpeed() const
return Vector(150, 150, 0);
}
-void PlayerHandler::processWalkResponse(Net::MessageIn &msg)
+void PlayerHandler::processWalkResponse(Net::MessageIn &msg) const
{
/*
* This client assumes that all walk messages succeed,
@@ -186,7 +183,7 @@ void PlayerHandler::processWalkResponse(Net::MessageIn &msg)
player_node->setRealPos(dstX, dstY);
}
-void PlayerHandler::processPlayerWarp(Net::MessageIn &msg)
+void PlayerHandler::processPlayerWarp(Net::MessageIn &msg) const
{
std::string mapPath = msg.readString(16);
int x = msg.readInt16();
@@ -241,11 +238,11 @@ void PlayerHandler::processPlayerWarp(Net::MessageIn &msg)
scrollOffsetY = (y - player_node->getTileY())
* map->getTileHeight();
}
+ scrollOffsetX = (x - player_node->getTileX())
+ * map->getTileWidth();
+ scrollOffsetY = (y - player_node->getTileY())
+ * map->getTileHeight();
}
-
- player_node->setAction(Being::STAND);
- player_node->setTileCoords(x, y);
- player_node->navigateClean();
}
logger->log("Adjust scrolling by %d:%d", scrollOffsetX, scrollOffsetY);
@@ -259,7 +256,7 @@ void PlayerHandler::processPlayerWarp(Net::MessageIn &msg)
}
}
-void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
+void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg) const
{
const int type = msg.readInt16();
const int value = msg.readInt32();
@@ -437,7 +434,7 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
}
}
-void PlayerHandler::processPlayerStatUpdate2(Net::MessageIn &msg)
+void PlayerHandler::processPlayerStatUpdate2(Net::MessageIn &msg) const
{
const int type = msg.readInt16();
switch (type)
@@ -480,7 +477,7 @@ void PlayerHandler::processPlayerStatUpdate2(Net::MessageIn &msg)
}
}
-void PlayerHandler::processPlayerStatUpdate3(Net::MessageIn &msg)
+void PlayerHandler::processPlayerStatUpdate3(Net::MessageIn &msg) const
{
const int type = msg.readInt32();
const int base = msg.readInt32();
@@ -492,7 +489,7 @@ void PlayerHandler::processPlayerStatUpdate3(Net::MessageIn &msg)
PlayerInfo::updateAttrs();
}
-void PlayerHandler::processPlayerStatUpdate4(Net::MessageIn &msg)
+void PlayerHandler::processPlayerStatUpdate4(Net::MessageIn &msg) const
{
const int type = msg.readInt16();
const int ok = msg.readInt8();
@@ -501,8 +498,8 @@ void PlayerHandler::processPlayerStatUpdate4(Net::MessageIn &msg)
if (ok != 1)
{
const int oldValue = PlayerInfo::getStatBase(type);
- int points = PlayerInfo::getAttribute(PlayerInfo::CHAR_POINTS);
- points += oldValue - value;
+ const int points = PlayerInfo::getAttribute(PlayerInfo::CHAR_POINTS)
+ + oldValue - value;
PlayerInfo::setAttribute(PlayerInfo::CHAR_POINTS, points);
NotifyManager::notify(NotifyManager::SKILL_RAISE_ERROR);
}
@@ -510,7 +507,7 @@ void PlayerHandler::processPlayerStatUpdate4(Net::MessageIn &msg)
PlayerInfo::setStatBase(type, value);
}
-void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
+void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg) const
{
PlayerInfo::setAttribute(PlayerInfo::CHAR_POINTS, msg.readInt16());
@@ -582,7 +579,7 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
msg.readInt16(); // manner
}
-void PlayerHandler::processPlayerStatUpdate6(Net::MessageIn &msg)
+void PlayerHandler::processPlayerStatUpdate6(Net::MessageIn &msg) const
{
const int type = msg.readInt16();
if (statusWindow)
@@ -615,10 +612,9 @@ void PlayerHandler::processPlayerStatUpdate6(Net::MessageIn &msg)
}
}
-void PlayerHandler::processPlayerArrowMessage(Net::MessageIn &msg)
+void PlayerHandler::processPlayerArrowMessage(Net::MessageIn &msg) const
{
const int type = msg.readInt16();
-
switch (type)
{
case 0:
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index 016b29782..57ff3b6af 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -37,39 +37,40 @@ class PlayerHandler : public Net::PlayerHandler
A_DELETE_COPY(PlayerHandler)
- void decreaseAttribute(int attr);
+ void decreaseAttribute(const int attr) const override;
- void ignorePlayer(const std::string &player, bool ignore);
+ void ignorePlayer(const std::string &player,
+ const bool ignore) const override;
- void ignoreAll(bool ignore);
+ void ignoreAll(const bool ignore) const override;
- bool canUseMagic() const;
+ bool canUseMagic() const override;
- bool canCorrectAttributes() const;
+ bool canCorrectAttributes() const override;
- Vector getDefaultWalkSpeed() const A_WARN_UNUSED;
+ Vector getDefaultWalkSpeed() const override A_WARN_UNUSED;
- int getJobLocation() const A_WARN_UNUSED;
+ int getJobLocation() const override A_WARN_UNUSED;
- int getAttackLocation() const A_WARN_UNUSED;
+ int getAttackLocation() const override A_WARN_UNUSED;
- void processWalkResponse(Net::MessageIn &msg);
+ void processWalkResponse(Net::MessageIn &msg) const;
- void processPlayerWarp(Net::MessageIn &msg);
+ void processPlayerWarp(Net::MessageIn &msg) const;
- void processPlayerStatUpdate1(Net::MessageIn &msg);
+ void processPlayerStatUpdate1(Net::MessageIn &msg) const;
- void processPlayerStatUpdate2(Net::MessageIn &msg);
+ void processPlayerStatUpdate2(Net::MessageIn &msg) const;
- void processPlayerStatUpdate3(Net::MessageIn &msg);
+ void processPlayerStatUpdate3(Net::MessageIn &msg) const;
- void processPlayerStatUpdate4(Net::MessageIn &msg);
+ void processPlayerStatUpdate4(Net::MessageIn &msg) const;
- void processPlayerStatUpdate5(Net::MessageIn &msg);
+ void processPlayerStatUpdate5(Net::MessageIn &msg) const;
- void processPlayerStatUpdate6(Net::MessageIn &msg);
+ void processPlayerStatUpdate6(Net::MessageIn &msg) const;
- void processPlayerArrowMessage(Net::MessageIn &msg);
+ void processPlayerArrowMessage(Net::MessageIn &msg) const;
};
} // namespace Ea