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/guildhandler.cpp | |
| parent | cfe4c893ba4ba30379919636d3c508ebf1594e23 (diff) | |
| download | mv-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.gz mv-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.bz2 mv-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.xz mv-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.zip | |
some other fixes from cpplint.
Diffstat (limited to 'src/net/ea/guildhandler.cpp')
| -rw-r--r-- | src/net/ea/guildhandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); |