From 35cfd460655878c9a615abc8ea1cb2f7577a7f3b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 21 Apr 2013 18:57:48 +0300
Subject: some other fixes from cpplint.

---
 src/net/tmwa/charserverhandler.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/net/tmwa/charserverhandler.cpp')

diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 3a72ffa03..773a9d060 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -253,8 +253,8 @@ void CharServerHandler::newCharacter(const std::string &name, const int slot,
         outMsg.writeInt8(static_cast<unsigned char>(stats[i]));
 
     outMsg.writeInt8(static_cast<unsigned char>(slot));
-    outMsg.writeInt16(static_cast<short>(hairColor));
-    outMsg.writeInt16(static_cast<short>(hairstyle));
+    outMsg.writeInt16(static_cast<int16_t>(hairColor));
+    outMsg.writeInt16(static_cast<int16_t>(hairstyle));
     if (serverVersion >= 2)
         outMsg.writeInt8(race);
 }
@@ -309,7 +309,7 @@ void CharServerHandler::processCharLogin(Net::MessageIn &msg)
     msg.skip(2);  // Length word
     const int slots = msg.readInt16();
     if (slots > 0 && slots < 30)
-        loginData.characterSlots = static_cast<short unsigned int>(slots);
+        loginData.characterSlots = static_cast<uint16_t>(slots);
 
     const bool version = msg.readInt8() == 1 && serverVersion > 0;
     msg.skip(17);  // 0 Unused
-- 
cgit v1.2.3-60-g2f50