diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-04-21 18:57:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-04-21 18:57:48 +0300 |
| commit | 35cfd460655878c9a615abc8ea1cb2f7577a7f3b (patch) | |
| tree | 2b4cb899f7f442912f89de30f4a5ab0add0727ce /src/net/ea/beinghandler.cpp | |
| parent | cfe4c893ba4ba30379919636d3c508ebf1594e23 (diff) | |
| download | manaplus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.gz manaplus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.bz2 manaplus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.xz manaplus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.zip | |
some other fixes from cpplint.
Diffstat (limited to 'src/net/ea/beinghandler.cpp')
| -rw-r--r-- | src/net/ea/beinghandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); |