From 3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 26 Sep 2014 23:25:32 +0300
Subject: Fix code style.

---
 src/net/eathena/mercenaryhandler.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/net/eathena/mercenaryhandler.cpp')

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
-- 
cgit v1.2.3-70-g09d2