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/ea/beinghandler.cpp | 6 +++---
 src/net/ea/beinghandler.h   | 2 +-
 src/net/ea/guildhandler.cpp | 4 ++--
 src/net/ea/partyhandler.cpp | 4 ++--
 src/net/ea/skillhandler.cpp | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/net/ea')

diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index ea668589c..5726f9ed0 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -65,7 +65,7 @@ BeingHandler::BeingHandler(const bool enableSync) :
 {
 }
 
-Being *BeingHandler::createBeing(const int id, const short job) const
+Being *BeingHandler::createBeing(const int id, const int16_t job) const
 {
     if (!actorSpriteManager)
         return nullptr;
@@ -130,11 +130,11 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg,
     else
         spawnId = 0;
     mSpawnId = 0;
-    short speed = msg.readInt16();
+    int16_t speed = msg.readInt16();
     const uint16_t stunMode = msg.readInt16();  // opt1
     uint32_t statusEffects = msg.readInt16();  // opt2
     statusEffects |= (static_cast<uint32_t>(msg.readInt16())) << 16;  // option
-    const short job = msg.readInt16();  // class
+    const int16_t job = msg.readInt16();  // class
 
     Being *dstBeing = actorSpriteManager->findBeing(id);
 
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index 6552e5a69..6798726bd 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -37,7 +37,7 @@ class BeingHandler : public Net::BeingHandler
         A_DELETE_COPY(BeingHandler)
 
     protected:
-        virtual Being *createBeing(int id, short job) const A_WARN_UNUSED;
+        virtual Being *createBeing(int id, int16_t job) const A_WARN_UNUSED;
 
         virtual void setSprite(Being *const being, const unsigned int slot,
                                const int id,
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index 65fa32634..3f0375fea 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -104,7 +104,7 @@ void GuildHandler::processGuildPositionInfo(Net::MessageIn &msg) const
     msg.readInt8();  // Unused
     std::string guildName = msg.readString(24);
 
-    Guild *const g = Guild::getGuild(static_cast<short int>(guildId));
+    Guild *const g = Guild::getGuild(static_cast<int16_t>(guildId));
     if (!g)
         return;
 
@@ -190,7 +190,7 @@ void GuildHandler::processGuildBasicInfo(Net::MessageIn &msg)
             castle.c_str()), BY_SERVER);
     }
 
-    Guild *const g = Guild::getGuild(static_cast<short int>(guildId));
+    Guild *const g = Guild::getGuild(static_cast<int16_t>(guildId));
     if (!g)
         return;
     g->setName(name);
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 0909232dd..a8233bbf6 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -207,8 +207,8 @@ void PartyHandler::processPartySettings(Net::MessageIn &msg)
     }
 
     // These seem to indicate the sharing mode for exp and items
-    const short exp = msg.readInt16();
-    const short item = msg.readInt16();
+    const int16_t exp = msg.readInt16();
+    const int16_t item = msg.readInt16();
 
     if (!Ea::partyTab)
         return;
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index 0a3054527..7fe37be95 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -124,7 +124,7 @@ void SkillHandler::processSkillFailed(Net::MessageIn &msg) const
     // Action failed (ex. sit because you have not reached the
     // right level)
     const int skillId   = msg.readInt16();
-    const short bskill  = msg.readInt16();
+    const int16_t bskill  = msg.readInt16();
     msg.readInt16();  // btype
     const signed char success = msg.readInt8();
     const signed char reason  = msg.readInt8();
-- 
cgit v1.2.3-70-g09d2