diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-26 23:25:32 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-26 23:25:32 +0300 |
| commit | 3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0 (patch) | |
| tree | d7f1400583c5bc6916129e05fc5e0907d1081ca9 /src/net/eathena/mercenaryhandler.cpp | |
| parent | 6112e911a5b702fa1a9fca7bb6300f0195cbe685 (diff) | |
| download | manaplus-3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0.tar.gz manaplus-3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0.tar.bz2 manaplus-3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0.tar.xz manaplus-3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0.zip | |
Fix code style.
Diffstat (limited to 'src/net/eathena/mercenaryhandler.cpp')
| -rw-r--r-- | src/net/eathena/mercenaryhandler.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/net/eathena/mercenaryhandler.cpp b/src/net/eathena/mercenaryhandler.cpp index 6ac4072c5..aa6152035 100644 --- a/src/net/eathena/mercenaryhandler.cpp +++ b/src/net/eathena/mercenaryhandler.cpp @@ -21,7 +21,6 @@ #include "net/eathena/mercenaryhandler.h" #include "actormanager.h" -#include "logger.h" #include "notifymanager.h" #include "being/being.h" @@ -31,8 +30,6 @@ #include "gui/windows/skilldialog.h" -#include "net/ea/eaprotocol.h" - #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" @@ -202,7 +199,9 @@ void MercenaryHandler::move(const int x, const int y) const return; createOutPacket(CMSG_HOMMERC_MOVE_TO); outMsg.writeInt32(id); - outMsg.writeCoordinates(x, y, 0U); + outMsg.writeCoordinates(static_cast<uint16_t>(x), + static_cast<uint16_t>(y), + 0U); } void MercenaryHandler::attack(const int targetId, const bool keep) const @@ -213,7 +212,7 @@ void MercenaryHandler::attack(const int targetId, const bool keep) const createOutPacket(CMSG_HOMMERC_ATTACK); outMsg.writeInt32(id); outMsg.writeInt32(targetId); - outMsg.writeInt8(keep ? 1 : 0); + outMsg.writeInt8(static_cast<int8_t>(keep ? 1 : 0)); } } // namespace EAthena |