summaryrefslogtreecommitdiff
path: root/src/net/eathena/beinghandler.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-21 18:57:48 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-21 18:57:48 +0300
commit35cfd460655878c9a615abc8ea1cb2f7577a7f3b (patch)
tree2b4cb899f7f442912f89de30f4a5ab0add0727ce /src/net/eathena/beinghandler.cpp
parentcfe4c893ba4ba30379919636d3c508ebf1594e23 (diff)
downloadplus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.gz
plus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.bz2
plus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.xz
plus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.zip
some other fixes from cpplint.
Diffstat (limited to 'src/net/eathena/beinghandler.cpp')
-rw-r--r--src/net/eathena/beinghandler.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 76f2cd7cc..71a098510 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -432,12 +432,12 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg,
// An update about a player, potentially including movement.
const int id = msg.readInt32();
- const short speed = msg.readInt16();
+ const 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; // status.options; Aethyra uses this as misc2
- const short job = msg.readInt16();
+ const int16_t job = msg.readInt16();
Being *dstBeing = actorSpriteManager->findBeing(id);
@@ -492,7 +492,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg,
if (guild == 0)
dstBeing->clearGuilds();
else
- dstBeing->setGuild(Guild::getGuild(static_cast<short>(guild)));
+ dstBeing->setGuild(Guild::getGuild(static_cast<int16_t>(guild)));
}
msg.readInt16(); // emblem
@@ -634,11 +634,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);
@@ -725,7 +725,7 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg,
msg.readInt16(); // manner
dstBeing->setStatusEffectBlock(32, msg.readInt16()); // opt3
msg.readInt8(); // karma
- short gender = msg.readInt8();
+ int16_t gender = msg.readInt8();
if (dstBeing->getType() == ActorSprite::PLAYER)
{